diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 1118f8bf..92e72818 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -2602,7 +2602,7 @@ void Creature::FollowToTarget()
 
 void Creature::DoRecoilForce(int distance)
 {
-    if (distance > 0) {
+    if (distance > 0 && GetMovement()->GetPathSize() <= 0) {
         glm::vec3 old_move_dir = GetMoveDir();
         MustBeAddBuff(this, kRecoilBuffId);
         SetMoveDir(GetAttackDir() * -1.0f);
diff --git a/server/gameserver/mt/MapMode.cc b/server/gameserver/mt/MapMode.cc
index de6db06b..963935f1 100644
--- a/server/gameserver/mt/MapMode.cc
+++ b/server/gameserver/mt/MapMode.cc
@@ -10,11 +10,6 @@ namespace mt
 
     void MapMode::Init1()
     {
-#ifdef MYDEBUG
-        if (mapMode() == 201) {
-            mapMode_ = kCircuitMatchMode;
-        }
-#endif
     }
 
     bool MapMode::IsOpen() const