diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index e399efa810c..36ed77f5824 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -315,10 +315,6 @@ public class AbilityUtils {
             for (final Card imprint : hostCard.getImprintedCards()) {
                 cards.add(game.getCardState(imprint));
             }
-        } else if (defined.equals("UntilLeavesBattlefield")) {
-            for (final Card ulb : hostCard.getUntilLeavesBattlefield()) {
-                cards.add(game.getCardState(ulb));
-            }
         } else if (defined.startsWith("ThisTurnEntered")) {
             final String[] workingCopy = defined.split("_");
             ZoneType destination, origin;
diff --git a/forge-gui/res/cardsfolder/g/gemini_engine.txt b/forge-gui/res/cardsfolder/g/gemini_engine.txt
index c7b60a8af49..02bae0351cd 100644
--- a/forge-gui/res/cardsfolder/g/gemini_engine.txt
+++ b/forge-gui/res/cardsfolder/g/gemini_engine.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact Creature Construct
 PT:3/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a colorless Construct artifact creature token named Twin that's attacking. Its power is equal to CARDNAME's power and its toughness is equal to CARDNAME's toughness. Sacrifice the token at end of combat.
-SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenScript$ twin | TokenOwner$ You | LegacyImage$ twin dst | TokenPower$ X | TokenToughness$ Y | TokenAttacking$ True | AtEOT$ SacrificeCombat
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ twin | TokenOwner$ You | LegacyImage$ twin dst | TokenPower$ X | TokenToughness$ Y | TokenAttacking$ True | AtEOT$ SacrificeCombat
 SVar:X:Count$CardPower
 SVar:Y:Count$CardToughness
 SVar:HasAttackEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/upcoming/phantom_steed.txt b/forge-gui/res/cardsfolder/upcoming/phantom_steed.txt
index 2a76962dbd1..425286f5833 100644
--- a/forge-gui/res/cardsfolder/upcoming/phantom_steed.txt
+++ b/forge-gui/res/cardsfolder/upcoming/phantom_steed.txt
@@ -4,10 +4,10 @@ Types:Creature Horse Illusion
 PT:4/3
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile another target creature you control until CARDNAME leaves the battlefield.
-SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | RememberChanged$ True | Duration$ UntilHostLeavesPlay
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | Duration$ UntilHostLeavesPlay
 SVar:PlayMain1:TRUE
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, create a tapped and attacking token that's a copy of the exiled card, except it's an Illusion in addition to its other types. Sacrifice that token at end of combat.
-SVar:TrigCopy:DB$ CopyPermanent | Defined$ UntilLeavesBattlefield | TokenTapped$ True | TokenAttacking$ True | AddTypes$ Illusion | AtEOT$ SacrificeCombat
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ ValidExile Card.ExiledWithSource | TokenTapped$ True | TokenAttacking$ True | AddTypes$ Illusion | AtEOT$ SacrificeCombat
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Sacrifice
 Oracle:Flash\nWhen Phantom Steed enters the battlefield, exile another target creature you control until Phantom Steed leaves the battlefield.\nWhenever Phantom Steed attacks, create a tapped and attacking token that's a copy of the exiled card, except it's an Illusion in addition to its other types. Sacrifice that token at end of combat.