diff --git a/server/gameserver/aicomponent.cc b/server/gameserver/aicomponent.cc
index 809f222..4c1d816 100644
--- a/server/gameserver/aicomponent.cc
+++ b/server/gameserver/aicomponent.cc
@@ -24,7 +24,6 @@ void AIComponent::SetAiMode(int ai_mode)
 
 int AIComponent::GetAiLevel()
 {
-    return 1;
     return ai_level_;
 }
 
diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc
index 40cff0d..e472807 100644
--- a/server/gameserver/android.ai.cc
+++ b/server/gameserver/android.ai.cc
@@ -68,7 +68,8 @@ void AndroidNewAI::Update(int delta_time)
         }
     }
     #endif
-    if (hum->room->GetGasData().gas_mode == GasInactive) {
+    if (hum->room->GetGasData().gas_mode == GasInactive ||
+        hum->room->GetGasData().gas_mode == GasJump) {
         DefaultAi();
         return;
     }
@@ -209,8 +210,8 @@ void AndroidNewAI::DoAttackOldAI()
                 bool shot_ok = false;
                 sender->Shot(shot_dir, shot_ok, DEFAULT_FLY_DISTANCE);
             }
+            old_ai_data_.last_target.Attach(enemy);
         }
-        old_ai_data_.last_target.Attach(enemy);
     }
 }