diff --git a/res/cardsfolder/m/mijae_djinn.txt b/res/cardsfolder/m/mijae_djinn.txt
index 97e1d8e09eb..4b1a32db17d 100644
--- a/res/cardsfolder/m/mijae_djinn.txt
+++ b/res/cardsfolder/m/mijae_djinn.txt
@@ -1,8 +1,11 @@
 Name:Mijae Djinn
 ManaCost:R R R
 Types:Creature Djinn
-Text:Whenever CARDNAME attacks, flip a coin. If you lose the flip, remove CARDNAME from combat and tap it.
 PT:6/3
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ FlipCoin | TriggerDescription$ Whenever CARDNAME attacks, flip a coin. If you lose the flip, remove CARDNAME from combat and tap it.
+SVar:FlipCoin:AB$ FlipACoin | Cost$ 0 | LoseSubAbility$ DBRemoveFromCombat
+SVar:DBRemoveFromCombat:DB$ RemoveFromCombat | Defined$ Self | SubAbility$ DBTap
+SVar:DBTap:DB$ Tap | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mijae_djinn.jpg
 Oracle:Whenever Mijae Djinn attacks, flip a coin. If you lose the flip, remove Mijae Djinn from combat and tap it.
 SetInfo:3ED Rare
diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index 69bf6d48a23..dc0ee47bdf4 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -1028,14 +1028,8 @@ public class CombatUtil {
         } // creatureAttacked
           // Annihilator
 
-        // Mijae Djinn
-        if (c.getName().equals("Mijae Djinn")) {
-            if (!GuiDialog.flipCoin(c.getController(), c)) {
-                game.getCombat().removeFromCombat(c);
-                c.tap();
-            }
-        } // Mijae Djinn
-        else if (c.getName().equals("Witch-Maw Nephilim") && !c.getDamageHistory().getCreatureAttackedThisCombat()
+
+        if (c.getName().equals("Witch-Maw Nephilim") && !c.getDamageHistory().getCreatureAttackedThisCombat()
                 && (c.getNetAttack() >= 10)) {
             final Card charger = c;
             final Ability ability2 = new Ability(c, ManaCost.ZERO) {