diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3aa9583faf..a8042d4690 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -553,7 +553,14 @@ namespace OpenSim.Region.Environment.Scenes
             // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
             // when the avatar stands up
 
-            AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight/6));
+            if (m_avHeight != 127.0f)
+            {
+                AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight / 6));
+            }
+            else
+            {
+                AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (1.56f / 6));
+            }
             SetMovementAnimation(Animations.AnimsLLUUID["LAND"], 2);
             SendFullUpdateToAllClients();
         }