diff --git a/res/cardsfolder/k/kagemaro_first_to_suffer.txt b/res/cardsfolder/k/kagemaro_first_to_suffer.txt
index ccd861b1a8c..1cbcfaf8cc4 100644
--- a/res/cardsfolder/k/kagemaro_first_to_suffer.txt
+++ b/res/cardsfolder/k/kagemaro_first_to_suffer.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Demon Spirit
 Text:no text
 PT:*/*
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your hand.
-A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SpellDescription$ All creatures get -X/-X until end of turn, where X is the number of cards in your hand.
+A:AB$ PumpAll | Cost$ B Sac<1/CARDNAME> | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SpellDescription$ All creatures get -X/-X until end of turn, where X is the number of cards in your hand.
 SVar:X:Count$InYourHand
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_DealDamage.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_DealDamage.java
index 1e3a39447eb..90291ffb1b8 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_DealDamage.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_DealDamage.java
@@ -943,14 +943,19 @@ public class AbilityFactory_DealDamage {
             targetPlayer = tgt.getTargetPlayers().get(0);
 
         String players = "";
+        CardList list = new CardList();
 
-        if (params.containsKey("ValidPlayers"))
+        if (params.containsKey("ValidPlayers")) {
             players = params.get("ValidPlayers");
+        }
+        
+        if (params.containsKey("ValidCards")) {
+            list = AllZoneUtil.getCardsInPlay();
+        }
 
-        CardList list = AllZoneUtil.getCardsInPlay();
-
-        if (targetPlayer != null)
+        if (targetPlayer != null) {
             list = list.getController(targetPlayer);
+        }
 
         list = AbilityFactory.filterListByType(list, params.get("ValidCards"), sa);
 
@@ -961,9 +966,9 @@ public class AbilityFactory_DealDamage {
                 p.addDamage(dmg, card);
         } else if (players.equals("EachOpponent")) {
             for (Player p : AllZoneUtil.getOpponents(card.getController())) p.addDamage(dmg, card);
-        } else if (players.equals("Self"))
+        } else if (players.equals("Self")) {
             card.getController().addDamage(dmg, card);
-        else if (players.equals("Targeted"))
+        } else if (players.equals("Targeted"))
             targetPlayer.addDamage(dmg, card);
     }
 }