diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index c5c634d79..9262aa3c5 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -132,7 +132,6 @@ namespace MWWorld
             Ogre::Vector3 up(0.0f, 0.0f, 1.0f);
             Ogre::Vector3 newPosition = position;
 
-            bool onground = false;
             if(gravity)
             {
                 newtrace(&trace, position, position+Ogre::Vector3(0,0,-10), halfExtents, verticalRotation, isInterior, engine);
@@ -162,8 +161,7 @@ namespace MWWorld
                 if(trace.fraction < 1.0f)
                 {
                     //std::cout<<"angle: "<<getSlope(trace.planenormal)<<"\n";
-                    onground = getSlope(currentNormal) <= sMaxSlope;
-                    if(!onground || currentNormal == lastNormal)
+                    if(getSlope(currentNormal) > sMaxSlope || currentNormal == lastNormal)
                     {
                         if(!stepMove(newPosition, velocity, remainingTime, verticalRotation, halfExtents, isInterior, engine))
                         {
@@ -190,7 +188,6 @@ namespace MWWorld
 
             verticalVelocity = clippedVelocity.z;
             physicActor->setVerticalForce(verticalVelocity - time*400.0f);
-            physicActor->setOnGround(onground);
 
             return newPosition;
         }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 085add7c9..6e063e1fe 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1369,10 +1369,12 @@ namespace MWWorld
         Ptr::CellStore *currentCell = mWorldScene->getCurrentCell();
 
         RefData &refdata = mPlayer->getPlayer().getRefData();
-        const OEngine::Physic::PhysicActor *physact = mPhysEngine->getCharacter(refdata.getHandle());
         Ogre::Vector3 playerPos(refdata.getPosition().pos);
 
-        if(!physact->getOnGround() || isUnderwater(*currentCell->mCell, playerPos))
+        std::pair<bool,Ogre::Vector3> hit = mPhysics->castRay(playerPos, Ogre::Vector3(0,0,-1), 50);
+        bool isOnGround = (hit.first ? (hit.second.distance (playerPos) < 25) : false);
+
+        if(!isOnGround || isUnderwater(*currentCell->mCell, playerPos))
             return 2;
 
         if((currentCell->mCell->mData.mFlags&ESM::Cell::NoSleep))