diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp
index 469183ab1c..fcd9991091 100644
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@@ -1376,6 +1376,9 @@ begin
     try
       BinCompStream.Position:=0;
       Writer:=CreateLRSWriter(BinCompStream,DestroyDriver);
+      {$IFNDEF DisableFakeMethods}
+      Writer.OnWriteMethodProperty:=@WriteMethodPropertyEvent;
+      {$ENDIF}
       Writer.OnFindAncestor:=@WriterFindAncestor;
       AncestorUnit:=AnUnitInfo.FindAncestorUnit;
       Ancestor:=nil;
diff --git a/ide/main.pp b/ide/main.pp
index 8200df566e..62fc26fd35 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -4727,7 +4727,6 @@ begin
           if AncestorUnit<>nil then
             Ancestor:=AncestorUnit.Component;
           Writer.WriteDescendent(AnUnitInfo.Component,Ancestor);
-          Writer.WriteDescendent(AnUnitInfo.Component,nil);
           if DestroyDriver then Writer.Driver.Free;
           FreeAndNil(Writer);
           AnUnitInfo.ComponentLastBinStreamSize:=BinCompStream.Size;