diff --git a/src/main/java/forge/game/limited/BoosterDraftAI.java b/src/main/java/forge/game/limited/BoosterDraftAI.java
index aab21a6a613..27e8b6005e8 100644
--- a/src/main/java/forge/game/limited/BoosterDraftAI.java
+++ b/src/main/java/forge/game/limited/BoosterDraftAI.java
@@ -384,8 +384,8 @@ public class BoosterDraftAI {
 
         // 1.Add up to 15 on-color creatures
         int i = 0;
-        while (nCreatures > 0 && creatures.size() > i) {
-            final Card c = creatures.get(i);
+        while (nCreatures > 0 && creatures.size() > 0) {
+            final Card c = creatures.get(0);
 
             outList.add(c);
             cardsNeeded--;
@@ -436,10 +436,10 @@ public class BoosterDraftAI {
             }
         }
 
-        // 3.Try to fill up to 22 with on-color creatures cards (if more than 15 are present)
         i = 0;
-        while (cardsNeeded > 0 && (i < creatures.size())) {
-            final Card c = creatures.get(i);
+        // 3.Try to fill up to 22 with on-color creatures cards (if more than 15 are present)
+        while (cardsNeeded > 0 && (0 < creatures.size())) {
+            final Card c = creatures.get(0);
 
             outList.add(c);
             cardsNeeded--;