diff --git a/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript b/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript
index 51a4566fa..7fde01a71 100644
--- a/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript
+++ b/Templates/BaseGame/game/core/utility/scripts/gameObjectManagement.tscript
@@ -82,10 +82,17 @@ function GameBaseData::onNewDataBlock(%this, %obj, %reload)
 {
    if (%reload)
    {
+      %client = "";
+      if (isObject(%obj.client))
+         %client = %obj.client;
+         
       if(%this.isMethod("onRemove"))
          %this.onRemove(%obj);
       if(%this.isMethod("onAdd"))
          %this.onAdd(%obj);
+         
+      if (%client)
+         %client.setControlObject(%obj);
    }
 }