diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d3d2988ad..1276a449f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -170,6 +170,7 @@
     Bug #6794: Light sources are attached to mesh bounds centers instead of mesh origins when AttachLight NiNode is missing
     Bug #6799: Game crashes if an NPC has no Class attached
     Bug #6849: ImageButton texture is not scaled properly
+    Bug #6860: Sinnammu randomly strafes while running on water
     Bug #6869: Hits queue stagger during swing animation
     Bug #6890: SDL_PeepEvents errors are not handled
     Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 0b59782992..a17703a642 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -139,11 +139,18 @@ namespace MWMechanics
             mStateDuration = 0;
             mPrev = position;
             mInitialDistance = (destination - position).length();
+            mDestination = destination;
             return;
         }
 
         if (mWalkState != WalkState::Evade)
         {
+            if (mDestination != destination)
+            {
+                mInitialDistance = (destination - mPrev).length();
+                mDestination = destination;
+            }
+
             const float distSameSpot = DIST_SAME_SPOT * actor.getClass().getCurrentSpeed(actor) * duration;
             const float prevDistance = (destination - mPrev).length();
             const float currentDistance = (destination - position).length();
diff --git a/apps/openmw/mwmechanics/obstacle.hpp b/apps/openmw/mwmechanics/obstacle.hpp
index bb11a9d611..be9680f527 100644
--- a/apps/openmw/mwmechanics/obstacle.hpp
+++ b/apps/openmw/mwmechanics/obstacle.hpp
@@ -45,6 +45,7 @@ namespace MWMechanics
 
     private:
         osg::Vec3f mPrev;
+        osg::Vec3f mDestination;
 
         // directions to try moving in when get stuck
         static const float evadeDirections[NUM_EVADE_DIRECTIONS][2];
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index b9cd9b26d3..30fdb21ef3 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -188,27 +188,15 @@ namespace DetourNavigator
             const RecastParams& params, rcHeightfield& solid)
         {
             const std::array vertices{
-                rectangle.mBounds.mMin.x(),
-                rectangle.mHeight,
-                rectangle.mBounds.mMin.y(),
-                rectangle.mBounds.mMin.x(),
-                rectangle.mHeight,
-                rectangle.mBounds.mMax.y(),
-                rectangle.mBounds.mMax.x(),
-                rectangle.mHeight,
-                rectangle.mBounds.mMax.y(),
-                rectangle.mBounds.mMax.x(),
-                rectangle.mHeight,
-                rectangle.mBounds.mMin.y(),
+                rectangle.mBounds.mMin.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(), // vertex 0
+                rectangle.mBounds.mMin.x(), rectangle.mHeight, rectangle.mBounds.mMax.y(), // vertex 1
+                rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMax.y(), // vertex 2
+                rectangle.mBounds.mMax.x(), rectangle.mHeight, rectangle.mBounds.mMin.y(), // vertex 3
             };
 
             const std::array indices{
-                0,
-                1,
-                2,
-                0,
-                2,
-                3,
+                0, 1, 2, // triangle 0
+                0, 2, 3, // triangle 1
             };
 
             const std::array<unsigned char, 2> areas{ areaType, areaType };