diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 1ca2407b..379123af 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -321,6 +321,11 @@ public class MockRace extends Race {
 
             checkPosition(boat, totalElapsedMilliseconds);
 
+            if (boat.getCurrentSpeed() == 0) {
+                newOptimalVMG(boat);
+                boat.setBearing(boat.calculateBearingToNextMarker());
+            }
+
             setBoatSpeed(boat);
 
             //Calculates the distance travelled, in meters, in the current timeslice.