diff --git a/src/Battling/Flow/TurnHandler.cpp b/src/Battling/Flow/TurnHandler.cpp
index 13bfc92..4e4c623 100644
--- a/src/Battling/Flow/TurnHandler.cpp
+++ b/src/Battling/Flow/TurnHandler.cpp
@@ -42,7 +42,7 @@ void TurnHandler::ExecuteChoice(const BaseTurnChoice *choice) {
     }
 
     switch (choiceKind){
-        case TurnChoiceKind::Pass: return;
+        case TurnChoiceKind::Pass: throw NotReachableException();
         case TurnChoiceKind::Attack:
             return ExecuteAttackChoice(dynamic_cast<const AttackTurnChoice*>(choice));
         case TurnChoiceKind::Item:
diff --git a/src/Battling/Models/Battle.cpp b/src/Battling/Models/Battle.cpp
index 4dc1220..c259f92 100644
--- a/src/Battling/Models/Battle.cpp
+++ b/src/Battling/Models/Battle.cpp
@@ -50,6 +50,7 @@ void Battle::CheckChoicesSetAndRun() {
            choices[i] = choice;
            i++;
        }
+       side->ResetChoices();
     }
     TurnOrdering::OrderChoices(choices, _random);
     auto choiceQueue = new ChoiceQueue(choices);