diff --git a/.gitattributes b/.gitattributes
index 0ded2f6b881..0f53032df45 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9711,6 +9711,7 @@ res/cardsfolder/s/show_and_tell.txt svneol=native#text/plain
 res/cardsfolder/s/show_of_valor.txt -text
 res/cardsfolder/s/shower_of_coals.txt -text svneol=unset#text/plain
 res/cardsfolder/s/shower_of_sparks.txt svneol=native#text/plain
+res/cardsfolder/s/showstopper.txt -text
 res/cardsfolder/s/shrapnel_blast.txt svneol=native#text/plain
 res/cardsfolder/s/shred_memory.txt -text
 res/cardsfolder/s/shrewd_hatchling.txt svneol=native#text/plain
diff --git a/res/cardsfolder/s/showstopper.txt b/res/cardsfolder/s/showstopper.txt
new file mode 100644
index 00000000000..38939637f41
--- /dev/null
+++ b/res/cardsfolder/s/showstopper.txt
@@ -0,0 +1,10 @@
+Name:Showstopper
+ManaCost:1 B R
+Types:Instant
+A:SP$ AnimateAll | Cost$ 1 B R | ValidCards$ Creature.YouCtrl | Triggers$ DiesTrigger | sVars$ ShowstopperTrigDamage | References$ DiesTrigger,ShowstopperTrigDamage | SpellDescription$ Until end of turn, creatures you control gain "When this creature dies, it deals 2 damage to target creature an opponent controls."
+SVar:DiesTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ ShowstopperTrigDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 2 damage to target creature an opponent controls.
+SVar:ShowstopperTrigDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ 2
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/showstopper.jpg
+Oracle:Until end of turn, creatures you control gain "When this creature dies, it deals 2 damage to target creature an opponent controls."
+SetInfo:DGM Uncommon
\ No newline at end of file
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index 9768c151317..324416d6c7c 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -248,7 +248,7 @@ public class TriggerHandler {
             Card card = (Card) runParams.get("Card");
             if (card.getController() == player) {
                 for (final Trigger t : card.getTriggers()) {
-                    if (!t.isStatic() && t.isTemporary() && canRunTrigger(t, mode, runParams)) {
+                    if (!t.isStatic() && !t.isIntrinsic() && canRunTrigger(t, mode, runParams)) {
                         this.runSingleTrigger(t, runParams);
                         checkStatics = true;
                     }