diff --git a/Autodocking 2/AntennaHandler.cs b/Autodocking 2/AntennaHandler.cs
index 9bc68fe..1216d7f 100644
--- a/Autodocking 2/AntennaHandler.cs	
+++ b/Autodocking 2/AntennaHandler.cs	
@@ -71,7 +71,7 @@ public void SendPositionUpdateRequest(long target_platform)
 
             public bool blockIsOnMyGrid(IMyTerminalBlock block)
             {
-                return block.CubeGrid.EntityId == parent_program.Me.CubeGrid.EntityId;
+                return block.IsSameConstructAs(parent_program.Me);
             }
 
             public void HandleMessage()
diff --git a/Autodocking 2/IOHandler.cs b/Autodocking 2/IOHandler.cs
index a43941d..88de5c7 100644
--- a/Autodocking 2/IOHandler.cs	
+++ b/Autodocking 2/IOHandler.cs	
@@ -72,7 +72,7 @@ public void FindOutputBlocks()
 
             public bool blockIsOnMyGrid(IMyTerminalBlock block)
             {
-                return block.CubeGrid.EntityId == parent_program.Me.CubeGrid.EntityId;
+                return block.IsSameConstructAs(parent_program.Me);
             }
 
             /// <summary>
diff --git a/Autodocking 2/ShipSystemsAnalyzer.cs b/Autodocking 2/ShipSystemsAnalyzer.cs
index 0bba871..0623f3a 100644
--- a/Autodocking 2/ShipSystemsAnalyzer.cs	
+++ b/Autodocking 2/ShipSystemsAnalyzer.cs	
@@ -343,7 +343,7 @@ public void GatherBasicData()
             /// <returns>bool</returns>
             public bool blockIsOnMyGrid(IMyTerminalBlock block)
             {
-                return block.CubeGrid.EntityId == parent_program.Me.CubeGrid.EntityId;
+                return block.IsSameConstructAs(parent_program.Me);
             }
 
             public static double GetRadiusOfConnector(IMyShipConnector con)
@@ -398,7 +398,7 @@ public IMyShipConnector FindMyConnectedConnector()
                 var found_connected_connector = false;
                 var found_connectable_connector = false;
                 foreach (var connector in Connectors)
-                    if ((cockpit.CubeGrid.ToString() == connector.CubeGrid.ToString() &&
+                    if ((cockpit.IsSameConstructAs(connector) &&
                         !connector.CustomName.ToLower().Contains("[recall dock]") && !parent_program.allow_connector_on_seperate_grid) || (parent_program.allow_connector_on_seperate_grid && connector.CustomName.ToLower().Contains("[dock]")))
                     {
                         if (connector.Status == MyShipConnectorStatus.Connected)