diff --git a/src/DatabaseServices/Region.ts b/src/DatabaseServices/Region.ts
index 2d1d20565..290f89ae0 100644
--- a/src/DatabaseServices/Region.ts
+++ b/src/DatabaseServices/Region.ts
@@ -105,7 +105,9 @@ export class Region extends Entity
             let mat = ColorMaterial.GetBasicMaterial(this.ColorIndex);
             mat.opacity = 0.6;
             mat.transparent = true;
-            regionGroup.add(new THREE.Mesh(geometry, mat))
+            let mesh = new THREE.Mesh(geometry, mat);
+            mesh.userData = this;
+            regionGroup.add(mesh);
         })
     }
     ReadFile(file: CADFile)
diff --git a/src/Editor/GetEntityServices.ts b/src/Editor/GetEntityServices.ts
index f14a55ffd..be8d1f9e1 100644
--- a/src/Editor/GetEntityServices.ts
+++ b/src/Editor/GetEntityServices.ts
@@ -177,5 +177,6 @@ export class GetEntityServices implements EditorService
             return;
         this.RestState();
         this.m_promisResolve(result);
+        this.m_promisResolve = undefined;
     }
 }