diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
index 3023a30a2..33e405ef4 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
@@ -1497,6 +1497,7 @@ namespace Barotrauma
                         }
                     }
 
+                    //TODO: this does not work, the positions are in sim units but FindHull uses display units
                     Hull serverHull = Hull.FindHull(serverPos.Position, character.CurrentHull, false);
                     Hull clientHull = Hull.FindHull(localPos.Position, serverHull, false);
                     
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
index 506f1a5da..60f67e238 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
@@ -335,6 +335,12 @@ namespace Barotrauma.Items.Components
 
         private void CreateDoorBody()
         {
+            if (doorBody != null)
+            {
+                GameMain.World.RemoveBody(doorBody);
+                doorBody = null;
+            }
+
             Vector2 position = ConvertUnits.ToSimUnits(item.Position + (dockingTarget.door.Item.WorldPosition - item.WorldPosition));
             if (!MathUtils.IsValid(position))
             {
@@ -351,6 +357,8 @@ namespace Barotrauma.Items.Components
                 position = Vector2.Zero;
             }
 
+            System.Diagnostics.Debug.Assert(doorBody == null);
+
             doorBody = BodyFactory.CreateRectangle(GameMain.World,
                 dockingTarget.door.Body.width,
                 dockingTarget.door.Body.height,