diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 311d072c5..49ac5bc15 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -274,6 +274,9 @@ namespace MWBase
             virtual void adjustPosition (const MWWorld::Ptr& ptr) = 0;
             ///< Adjust position after load to be on ground. Must be called after model load.
 
+            virtual void fixPosition (const MWWorld::Ptr& actor) = 0;
+            ///< Attempt to fix position so that the Ptr is no longer inside collision geometry.
+
             virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
 
             virtual void moveObject (const MWWorld::Ptr& ptr, float x, float y, float z) = 0;
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 2e2e9b698..94d734029 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -47,6 +47,7 @@ namespace MWScript
                     if (world->findExteriorPosition(cell, pos))
                     {
                         world->changeToExteriorCell(pos);
+                        world->fixPosition(world->getPlayerPtr());
                     }
                     else
                     {
@@ -79,6 +80,7 @@ namespace MWScript
                     pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
 
                     world->changeToExteriorCell (pos);
+                    world->fixPosition(world->getPlayerPtr());
                 }
         };
 
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 9984633cd..6802d6118 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -215,7 +215,7 @@ namespace MWWorld
 
 
     public:
-        static Ogre::Vector3 traceDown(const MWWorld::Ptr &ptr, OEngine::Physic::PhysicEngine *engine)
+        static Ogre::Vector3 traceDown(const MWWorld::Ptr &ptr, OEngine::Physic::PhysicEngine *engine, float maxHeight)
         {
             const ESM::Position &refpos = ptr.getRefData().getPosition();
             Ogre::Vector3 position(refpos.pos);
@@ -224,7 +224,6 @@ namespace MWWorld
             if (!physicActor)
                 return position;
 
-            const int maxHeight = 200.f;
             OEngine::Physic::ActorTracer tracer;
             tracer.findGround(physicActor, position, position-Ogre::Vector3(0,0,maxHeight), engine);
             if(tracer.mFraction >= 1.0f)
@@ -600,9 +599,9 @@ namespace MWWorld
         return mEngine->getCollisions(ptr.getRefData().getBaseNode()->getName());
     }
 
-    Ogre::Vector3 PhysicsSystem::traceDown(const MWWorld::Ptr &ptr)
+    Ogre::Vector3 PhysicsSystem::traceDown(const MWWorld::Ptr &ptr, float maxHeight)
     {
-        return MovementSolver::traceDown(ptr, mEngine);
+        return MovementSolver::traceDown(ptr, mEngine, maxHeight);
     }
 
     void PhysicsSystem::addHeightField (float* heights,
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index df9718669..8e0be95d5 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -56,7 +56,7 @@ namespace MWWorld
             void stepSimulation(float dt);
 
             std::vector<std::string> getCollisions(const MWWorld::Ptr &ptr); ///< get handles this object collides with
-            Ogre::Vector3 traceDown(const MWWorld::Ptr &ptr);
+            Ogre::Vector3 traceDown(const MWWorld::Ptr &ptr, float maxHeight);
 
             std::pair<float, std::string> getFacedHandle(float queryDistance);
             std::pair<std::string,Ogre::Vector3> getHitContact(const std::string &name,
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index fdac643be..33405b4d8 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1166,7 +1166,7 @@ namespace MWWorld
 
         if (!isFlying(ptr))
         {
-            Ogre::Vector3 traced = mPhysics->traceDown(ptr);
+            Ogre::Vector3 traced = mPhysics->traceDown(ptr, 200);
             if (traced.z < pos.pos[2])
                 pos.pos[2] = traced.z;
         }
@@ -1174,6 +1174,17 @@ namespace MWWorld
         moveObject(ptr, ptr.getCell(), pos.pos[0], pos.pos[1], pos.pos[2]);
     }
 
+    void World::fixPosition(const Ptr &actor)
+    {
+        const float dist = 8000;
+        ESM::Position pos (actor.getRefData().getPosition());
+        pos.pos[2] += dist;
+        actor.getRefData().setPosition(pos);
+
+        Ogre::Vector3 traced = mPhysics->traceDown(actor, dist*1.1);
+        moveObject(actor, actor.getCell(), traced.x, traced.y, traced.z);
+    }
+
     void World::rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust)
     {
         rotateObjectImp(ptr, Ogre::Vector3(Ogre::Degree(x).valueRadians(),
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 69b72b533..08d7eb42d 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -263,6 +263,9 @@ namespace MWWorld
             virtual void adjustPosition (const Ptr& ptr);
             ///< Adjust position after load to be on ground. Must be called after model load.
 
+            virtual void fixPosition (const Ptr& actor);
+            ///< Attempt to fix position so that the Ptr is no longer inside collision geometry.
+
             virtual void enable (const Ptr& ptr);
 
             virtual void disable (const Ptr& ptr);