diff --git a/src/Battling/Models/Battle.cpp b/src/Battling/Models/Battle.cpp
index 57f6e21..a5767a6 100644
--- a/src/Battling/Models/Battle.cpp
+++ b/src/Battling/Models/Battle.cpp
@@ -26,13 +26,16 @@ bool Battle::TrySetChoice(BaseTurnChoice* choice) {
 
 void Battle::CheckChoicesSetAndRun() {
     for (auto side : _sides) {
-        if (!side->AllPossibleSlotsFilled()) {
-            return;
-        }
         if (!side->AllChoicesSet()) {
             return;
         }
     }
+    for (auto side : _sides) {
+        if (!side->AllPossibleSlotsFilled()) {
+            return;
+        }
+    }
+
     auto choices = std::vector<BaseTurnChoice*>(_numberOfSides * _creaturesPerSide);
     auto i = 0;
     for (auto side : _sides) {