diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
index fc6899ed507..ea774a997ed 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
@@ -89,15 +89,14 @@ public class TriggerDrawn extends Trigger {
 
         if (hasParam("FirstCardInDrawStep")) {
             final Player p = ((Player)runParams.get(AbilityKey.Player));
-            if (!game.getPhaseHandler().is(PhaseType.DRAW, p) || p.numDrawnThisDrawStep() > 1) {
-                return false;
-            }
-        }
-
-        if (hasParam("NotFirstCardInDrawStep")) {
-            final Player p = ((Player)runParams.get(AbilityKey.Player));
-            if (p.numDrawnThisDrawStep() == 1 && game.getPhaseHandler().is(PhaseType.DRAW, p)) {
-                return false;
+            if (getParam("FirstCardInDrawStep").equals("True")) {
+                if (!game.getPhaseHandler().is(PhaseType.DRAW, p) || p.numDrawnThisDrawStep() > 1) {
+                    return false;
+                }
+            } else {
+                if (p.numDrawnThisDrawStep() == 1 && game.getPhaseHandler().is(PhaseType.DRAW, p)) {
+                    return false;
+                }
             }
         }