diff --git a/forge-game/src/main/java/forge/game/ability/effects/MeldEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MeldEffect.java
index 9a3dbd540f0..b40699458e8 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MeldEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MeldEffect.java
@@ -6,12 +6,12 @@ import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardLists;
-import forge.game.event.GameEventCombatChanged;
 import forge.game.card.CardPredicates;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.PlayerZoneBattlefield;
 import forge.game.zone.ZoneType;
+import forge.game.event.GameEventCombatChanged;
 import forge.util.Localizer;
 import java.util.Arrays;
 
@@ -47,12 +47,19 @@ public class MeldEffect extends SpellAbilityEffect {
         }
 
         for (Card c : exiled) {
+        boolean attacking = sa.hasParam("Attacking");
             if (c.isToken() || c.getCloneOrigin() != null) {
                 // Neither of these things
                 return;
             } else if (!c.isInZone(ZoneType.Exile)) {
                 return;
             }
+            if (sa.hasParam("EntersTapped")) {
+                c.setTapped(true);
+            }
+            if (sa.hasParam("Attacking")) {
+            	attacking = true;
+            }
         }
 
         primary.changeToState(CardStateName.Meld);
@@ -62,9 +69,5 @@ public class MeldEffect extends SpellAbilityEffect {
         game.getAction().changeZone(primary.getZone(), bf, primary, 0, sa);
         bf.addToMelded(secondary);
         
-        	
-        if (sa.hasParam("Enters Tapped")) {
-            primary.setTapped(true);
-        }
     }
 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
index 2d3658dc705..054fdba1e30 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
@@ -18,6 +18,7 @@
 package forge.game.ability.effects;
 
 import java.util.Arrays;
+
 import java.util.List;
 
 import forge.util.Lang;
diff --git a/forge-gui/res/cardsfolder/upcoming/mishra_claimed_by_gix.txt b/forge-gui/res/cardsfolder/upcoming/mishra_claimed_by_gix.txt
index 812501628a1..027cf42ee0e 100644
--- a/forge-gui/res/cardsfolder/upcoming/mishra_claimed_by_gix.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mishra_claimed_by_gix.txt
@@ -6,7 +6,7 @@ K:Flying
 K:First Strike
 K:Lifelink
 T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Card.Self+YouOwn | IsPresent2$ Creature.YouCtrl+YouOwn+namedPhyrexian Dragon Engine | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you both own and control CARDNAME and a creature named Bruna, the Fading Light, exile them, then meld them into Brisela, Voice of Nightmares.
-SVar:Meld:DB$ Meld | Name$ Mishra, Lost to Phyrexia | Primary$ Mishra, Claimed by Gix | Secondary$ Phyrexian Dragon Engine
+SVar:Meld:DB$ Meld | Name$ Mishra, Lost to Phyrexia | EntersTapped$ True | Attacking$ True | Primary$ Mishra, Claimed by Gix | Secondary$ Phyrexian Dragon Engine
 DeckHints:Name$Phyrexian Dragon Engine
 MeldPair:Phyrexian Dragon Engine
 AlternateMode:Meld