diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index 4ee019b762..f02cdba220 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -48,7 +48,6 @@ namespace MWMechanics
             float mMaxDist;
             float mRemainingDuration; // In seconds
 
-            //PathFinder mPathFinder;
             int mCellX;
             int mCellY;
     };
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 62e23db585..8f0da94e1f 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -280,7 +280,7 @@ namespace MWMechanics
         float directionY = nextPoint.mY - y;
         float directionResult = sqrt(directionX * directionX + directionY * directionY);
 
-        return Ogre::Radian(Ogre::Math::ACos(directionY / directionResult) * sgn(Ogre::Math::ASin(directionX / directionResult))).valueDegrees();
+        return Ogre::Math::ATan2(directionX,directionY).valueDegrees();
     }
 
     bool PathFinder::checkWaypoint(float x, float y, float z)