diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index 8786d25549..f962c242bf 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -94,6 +94,8 @@ template<>
 void
 WaypointMovementGenerator<Creature>::Initialize(Creature &u)
 {
+    i_currentNode = 0;
+    StopedByPlayer = false;
 	u.StopMoving();
 	if(!path_id)
 		path_id = u.GetWaypointPath();