diff --git a/tasks/combat/state.py b/tasks/combat/state.py
index 25cb85d9d..9c21b3251 100644
--- a/tasks/combat/state.py
+++ b/tasks/combat/state.py
@@ -16,7 +16,7 @@ class CombatState(UI):
     def is_combat_executing(self) -> bool:
         appear = self.appear(COMBAT_PAUSE)
         if appear:
-            if COMBAT_PAUSE.button_offset[0] <= 5:
+            if COMBAT_PAUSE.button_offset[0] < 3:
                 return True
 
         return False
diff --git a/tasks/forgotten_hall/team.py b/tasks/forgotten_hall/team.py
index 4ba10c185..ac91a6ca1 100644
--- a/tasks/forgotten_hall/team.py
+++ b/tasks/forgotten_hall/team.py
@@ -95,7 +95,8 @@ class ForgottenHallTeam(UI):
             if timeout.reached():
                 logger.info('Team not prepared')
                 return False
-            chosen_list = [not self.appear(s) for s in seats]
-            if all(chosen_list):
-                logger.info("Team already prepared")
-                return True
+            if self.team_prepared():
+                chosen_list = [not self.appear(s) for s in seats]
+                if all(chosen_list):
+                    logger.info("Team already prepared")
+                    return True