diff --git a/forge-core/src/main/java/forge/card/BoosterGenerator.java b/forge-core/src/main/java/forge/card/BoosterGenerator.java
index cccf0b6e46f..a302c2618f5 100644
--- a/forge-core/src/main/java/forge/card/BoosterGenerator.java
+++ b/forge-core/src/main/java/forge/card/BoosterGenerator.java
@@ -204,11 +204,8 @@ public class BoosterGenerator {
 
             boolean foilInThisSlot = hasFoil && (slotType.equals(foilSlot));
 
-            if (foilInThisSlot && !foilAtEndOfPack) {
-                numCards--;
-            }
-
-            if (foilAtEndOfPack && hasFoil && slotType.startsWith(BoosterSlots.COMMON)) {
+            if ((foilInThisSlot && !foilAtEndOfPack)
+                    || (foilAtEndOfPack && hasFoil && slotType.startsWith(BoosterSlots.COMMON))) {
                 numCards--;
             }