diff --git a/forge-core/src/main/java/forge/card/BoosterGenerator.java b/forge-core/src/main/java/forge/card/BoosterGenerator.java
index af1febe1c92..cccf0b6e46f 100644
--- a/forge-core/src/main/java/forge/card/BoosterGenerator.java
+++ b/forge-core/src/main/java/forge/card/BoosterGenerator.java
@@ -204,7 +204,11 @@ public class BoosterGenerator {
 
             boolean foilInThisSlot = hasFoil && (slotType.equals(foilSlot));
 
-            if (foilInThisSlot) {
+            if (foilInThisSlot && !foilAtEndOfPack) {
+                numCards--;
+            }
+
+            if (foilAtEndOfPack && hasFoil && slotType.startsWith(BoosterSlots.COMMON)) {
                 numCards--;
             }
 
@@ -471,4 +475,4 @@ public class BoosterGenerator {
     }
 
 
-}
\ No newline at end of file
+}