diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index 9ef1f34c6a0..78e2f5a1780 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -433,12 +433,21 @@ public class CountersPutEffect extends SpellAbilityEffect {
                     for (Card c : AbilityUtils.getDefinedCards(card, sa.getParam("EachFromSource"), sa)) {
                         for (Entry<CounterType, Integer> cti : c.getCounters().entrySet()) {
                             if (gameCard != null) {
-                                gameCard.addCounter(cti.getKey(), cti.getValue(), placer, table);
+                                if (!sa.hasParam("CounterNum")) {
+                                    // default is all
+                                    counterAmount = cti.getValue();
+                                }
+                                if (etbcounter) {
+                                    gameCard.addEtbCounter(cti.getKey(), counterAmount, placer);
+                                } else {
+                                    gameCard.addCounter(cti.getKey(), counterAmount, placer, table);
+                                }
                             }
                         }
                     }
                     continue;
                 }
+
                 if (sa.hasParam("CounterTypePerDefined") || sa.hasParam("UniqueType")) {
                     counterType = chooseTypeFromList(sa, sa.getParam("CounterType"), obj, pc);
                     if (counterType == null) continue;
diff --git a/forge-gui/res/cardsfolder/f/fires_of_invention.txt b/forge-gui/res/cardsfolder/f/fires_of_invention.txt
index 63af8d696e6..81d147cff33 100644
--- a/forge-gui/res/cardsfolder/f/fires_of_invention.txt
+++ b/forge-gui/res/cardsfolder/f/fires_of_invention.txt
@@ -1,7 +1,8 @@
 Name:Fires of Invention
 ManaCost:3 R
 Types:Enchantment
-S:Mode$ CantBeCast | Caster$ You.NonActive | NumLimitEachTurn$ 2 | Description$ You can cast spells only during your turn and you can cast no more than two spells each turn.
+S:Mode$ CantBeCast | Caster$ You.NonActive | Description$ You can cast spells only during your turn and you can cast no more than two spells each turn.
+S:Mode$ CantBeCast | NumLimitEachTurn$ 2 | Caster$ You | Secondary$ True | Description$ You can cast spells only during your turn and you can cast no more than two spells each turn.
 S:Mode$ Continuous | Affected$ Card.nonLand+cmcLEX | MayPlay$ True | MayPlayWithoutManaCost$ True | AffectedZone$ Hand,Graveyard,Exile,Command,Library | MayPlayDontGrantZonePermissions$ True | Description$ You may cast spells with mana value less than or equal to the number of lands you control without paying their mana costs.
 SVar:X:Count$Valid Land.YouCtrl
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-fires_of_invention.txt b/forge-gui/res/cardsfolder/rebalanced/a-fires_of_invention.txt
index 6a3ff232065..8a91af762b6 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-fires_of_invention.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-fires_of_invention.txt
@@ -1,7 +1,8 @@
 Name:A-Fires of Invention
 ManaCost:4 R
 Types:Enchantment
-S:Mode$ CantBeCast | Caster$ You.NonActive | NumLimitEachTurn$ 2 | Description$ You can cast spells only during your turn and you can cast no more than two spells each turn.
+S:Mode$ CantBeCast | Caster$ You.NonActive | Description$ You can cast spells only during your turn and you can cast no more than two spells each turn.
+S:Mode$ CantBeCast | NumLimitEachTurn$ 2 | Caster$ You | Secondary$ True | Description$ You can cast spells only during your turn and you can cast no more than two spells each turn.
 S:Mode$ Continuous | Affected$ Card.nonLand+cmcLEX | MayPlay$ True | MayPlayWithoutManaCost$ True | AffectedZone$ Hand,Graveyard,Exile,Command,Library | MayPlayDontGrantZonePermissions$ True | Description$ You may cast spells with mana value less than or equal to the number of lands you control without paying their mana costs.
 SVar:X:Count$Valid Land.YouCtrl
 AI:RemoveDeck:Random