diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 631f1098211..027c4e80dab 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3206,7 +3206,7 @@ public class CardFactoryUtil {
                         trigStr.append(" | Secondary$ True");
                     }
                     trigStr.append("| TriggerDescription$ ").append(desc).append(" — ").append(sa.getDescription());
-                    final Trigger  t = TriggerHandler.parseTrigger(trigStr.toString(), card, intrinsic);
+                    final Trigger t = TriggerHandler.parseTrigger(trigStr.toString(), card, intrinsic);
                     t.setOverridingAbility(sa);
                     inst.addTrigger(t);
                 }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 85c339d00ed..93c36cd3a7c 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -121,7 +121,7 @@ public class TriggerHandler {
     }
 
     public static Trigger parseTrigger(final String trigParse, final Card host, final boolean intrinsic) {
-        return parseTrigger(trigParse, host, intrinsic, host);
+        return parseTrigger(trigParse, host, intrinsic, host.getCurrentState());
     }
 
     public static Trigger parseTrigger(final String trigParse, final Card host, final boolean intrinsic, final IHasSVars sVarHolder) {