diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py
index 4361262..82e7154 100644
--- a/src/combat/CombatCheck.py
+++ b/src/combat/CombatCheck.py
@@ -167,9 +167,6 @@ class CombatCheck:
             in_combat = self.in_team()[0] and self.check_health_bar()
             if in_combat:
                 self.target_enemy(wait=False)
-            else:
-                in_combat = self.target_enemy()
-            if in_combat:
                 if self.boss_lv_template is None:
                     self.find_boss_lv_text()
                 logger.info(
diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py
index 9c143cb..ad30e1a 100644
--- a/src/task/BaseCombatTask.py
+++ b/src/task/BaseCombatTask.py
@@ -69,7 +69,8 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck):
                 raise e
             except NotInCombatException as e:
                 logger.info(f'combat_once out of combat break {e}')
-                self.screenshot(f'combat_once out of combat break {self.out_of_combat_reason}')
+                if self.debug:
+                    self.screenshot(f'combat_once out of combat break {self.out_of_combat_reason}')
                 break
         self.wait_in_team_and_world(time_out=10)
         self.sleep(1)