diff --git a/src/DatabaseServices/Database.ts b/src/DatabaseServices/Database.ts
index 71ef79bf0..3f580f2fb 100644
--- a/src/DatabaseServices/Database.ts
+++ b/src/DatabaseServices/Database.ts
@@ -177,9 +177,9 @@ export class Database
         this.GroupTable.SetOwnerDatabase(this);
         this.Lights.SetOwnerDatabase(this);
         this.ProcessingGroupTable.SetOwnerDatabase(this);
-        this.DimStyleTable.SetOwnerDatabase(this);
         this.hm.SetDefaultDb(this);
         this.LayoutSpace.SetOwnerDatabase(this);
+        this.DimStyleTable.SetOwnerDatabase(this);
         this.idIndex = 100;
     }
 
@@ -187,7 +187,7 @@ export class Database
 
     FileWrite(file = new CADFiler): CADFiler
     {
-        file.Write(9);//ver;
+        file.Write(10);//ver;
         file.Write(this.idIndex);
         this.ModelSpace.WriteFile(file);
         this.TextureTable.WriteFile(file);
@@ -271,6 +271,12 @@ export class Database
             this.idIndex = indexBak;
         }
 
+        if (ver === 9)
+        {
+            for (let e of this.LayoutSpace.EntityCol.Objects)
+                e.Owner = this.LayoutSpace.objectId;
+        }
+
         this.SettingDefaultStyleAndMaterial();
 
         this.hm.doing = false;