diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index 0e61af7d59f..a85203ac483 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -300,6 +300,7 @@ public class CombatUtil {
         otherAttackers.remove(c);
         runParams.put("OtherAttackers", otherAttackers);
         runParams.put("Attacked", combat.getDefenderByAttacker(c));
+        runParams.put("DefendingPlayer", combat.getDefenderPlayerByAttacker(c));
         game.getTriggerHandler().runTrigger(TriggerType.Attacks, runParams, false);
 
         // Annihilator: can be copied by Strionic Resonator now
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
index 089b65b871b..fbf729da447 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
@@ -94,8 +94,7 @@ public class TriggerAttacks extends Trigger {
         }
 
         if (this.mapParams.containsKey("DefendingPlayerPoisoned")) {
-            Card attacker = (Card) runParams2.get("Attacker");
-            Player defendingPlayer = attacker.getGame().getCombat().getDefenderPlayerByAttacker(attacker);
+            Player defendingPlayer = (Player) runParams2.get("DefendingPlayer");
         	if (defendingPlayer.getPoisonCounters() == 0) {
         		return false;
         	}
@@ -109,7 +108,6 @@ public class TriggerAttacks extends Trigger {
     public final void setTriggeringObjects(final SpellAbility sa) {
         sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker"));
         sa.setTriggeringObject("Defender", this.getRunParams().get("Attacked"));
-        final Player defendingPlayer = ((Card) this.getRunParams().get("Attacker")).getGame().getCombat().getDefenderPlayerByAttacker((Card) this.getRunParams().get("Attacker"));
-        sa.setTriggeringObject("DefendingPlayer", defendingPlayer);
+        sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer"));
     }
 }