diff --git a/.gitattributes b/.gitattributes
index 1a052829247..5a5fc69cec4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2228,6 +2228,7 @@ res/cardsfolder/e/earthquake.txt svneol=native#text/plain
 res/cardsfolder/e/earthshaker.txt svneol=native#text/plain
 res/cardsfolder/e/eastern_paladin.txt svneol=native#text/plain
 res/cardsfolder/e/eater_of_days.txt svneol=native#text/plain
+res/cardsfolder/e/eater_of_the_dead.txt -text
 res/cardsfolder/e/ebon_dragon.txt svneol=native#text/plain
 res/cardsfolder/e/ebon_drake.txt svneol=native#text/plain
 res/cardsfolder/e/ebon_praetor.txt svneol=native#text/plain
diff --git a/res/cardsfolder/e/eater_of_the_dead.txt b/res/cardsfolder/e/eater_of_the_dead.txt
new file mode 100644
index 00000000000..a5b7df345bb
--- /dev/null
+++ b/res/cardsfolder/e/eater_of_the_dead.txt
@@ -0,0 +1,12 @@
+Name:Eater of the Dead
+ManaCost:4 B
+Types:Creature Horror
+Text:no text
+PT:3/4
+A:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBUntap | ConditionPresent$ Card.Self+tapped | SpellDescription$ If CARDNAME is tapped, exile target creature card from a graveyard and untap CARDNAME.
+SVar:DBUntap:DB$Untap | Defined$ Self | ConditionPresent$ Card.Self+tapped
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/eater_of_the_dead.jpg
+SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/6.jpg
+Oracle:{0}: If Eater of the Dead is tapped, exile target creature card from a graveyard and untap Eater of the Dead.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/j/jihad.txt b/res/cardsfolder/j/jihad.txt
index 7fe4d154694..e4ce9069fd5 100644
--- a/res/cardsfolder/j/jihad.txt
+++ b/res/cardsfolder/j/jihad.txt
@@ -1,13 +1,15 @@
-Name:Jihad
-ManaCost:W W W
-Types:Enchantment
-Text:no text
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color and an opponent.
-SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You
-S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 2 | AddToughness$ 1 | IsPresent$ Permanent.nontoken+ChosenColor+YouDontCtrl | Description$ White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color.
-T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.nontoken+ChosenColor+YouDontCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When the chosen player controls no nontoken permanents of the chosen color, sacrifice CARDNAME. 
-SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jihad.jpg
+Name:Jihad
+ManaCost:W W W
+Types:Enchantment
+Text:no text
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color and an opponent.
+SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You
+S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 2 | AddToughness$ 1 | IsPresent$ Permanent.nontoken+ChosenColor+YouDontCtrl | Description$ White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color.
+T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.nontoken+ChosenColor+YouDontCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When the chosen player controls no nontoken permanents of the chosen color, sacrifice CARDNAME.
+SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jihad.jpg
+SetInfo:ARN|Uncommon|http://magiccards.info/scans/en/an/60.jpg
+Oracle:As Jihad enters the battlefield, choose a color and an opponent.\nWhite creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color.\nWhen the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityFactory/AbilityFactory.java
index 6c75d6a2924..8b8c8528f38 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory.java
@@ -2064,6 +2064,9 @@ public class AbilityFactory {
             }
         } else {
             resolveSubAbilities(sa);
+            if (usedStack) {
+                AllZone.getStack().finishResolving(sa, false);
+            }
         }
     }