diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
index bcd14d893..d6cb21752 100644
--- a/src/game/WaypointMovementGenerator.h
+++ b/src/game/WaypointMovementGenerator.h
@@ -73,10 +73,8 @@ class MANGOS_DLL_SPEC WaypointMovementGenerator<Creature>
 : public MovementGeneratorMedium< Creature, WaypointMovementGenerator<Creature> >,
 public PathMovementBase<Creature, WaypointPath*>
 {
-    TimeTrackerSmall i_nextMoveTime;
-    std::vector<bool> i_hasDone;
     public:
-        WaypointMovementGenerator(Creature &) : i_nextMoveTime(0) {}
+        WaypointMovementGenerator(Creature &) : i_nextMoveTime(0), b_StopedByPlayer(false) {}
         ~WaypointMovementGenerator() { ClearWaypoints(); }
         void Initialize(Creature &u)
         {
@@ -85,7 +83,12 @@ public PathMovementBase<Creature, WaypointPath*>
             LoadPath(u);
         }
         void Finalize(Creature &) {}
-        void Reset(Creature &u) { ReloadPath(u); }
+        void Reset(Creature &u)
+        {
+            ReloadPath(u);
+            b_StopedByPlayer = false;
+            i_nextMoveTime.Reset(0);
+        }
         bool Update(Creature &u, const uint32 &diff);
 
         void MovementInform(Creature &);
@@ -104,6 +107,9 @@ public PathMovementBase<Creature, WaypointPath*>
         static void Initialize(void);
     private:
         void ClearWaypoints();
+
+        TimeTrackerSmall i_nextMoveTime;
+        std::vector<bool> i_hasDone;
         bool b_StopedByPlayer;
 };
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ae4d0945a..783240f02 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6892"
+ #define REVISION_NR "6893"
 #endif // __REVISION_NR_H__