diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 168a60ee68..8ed4e8795f 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
@@ -66,14 +66,5 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
-
-        internal void Close()
-        {
-            if (m_physicsActor != null)
-            {
-                m_scene.PhysScene.RemoveAvatar( PhysicsActor );
-                m_physicsActor = null;
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index cee93b20ec..d70752d952 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -931,5 +931,10 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_physicsActor = scene.AddAvatar(pVec);           
         }
+
+        internal void Close()
+        {
+            RemoveFromPhysicalScene();
+        }
     }
 }
\ No newline at end of file