diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
index d37e9c3da5..4a17a76b32 100644
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/DraconicRoar.java
@@ -29,7 +29,6 @@ package mage.sets.dragonsoftarkir;
 
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.costs.Cost;
 import mage.abilities.costs.common.RevealTargetFromHandCost;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DamageTargetEffect;
diff --git a/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java b/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java
index 126c8496a0..a0b703e5e7 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Thragtusk.java
@@ -50,7 +50,7 @@ public class Thragtusk extends CardImpl {
         this.expansionSetCode = "M13";
         this.subtype.add("Beast");
 
-        this.color.setGreen(true);
+
         this.power = new MageInt(5);
         this.toughness = new MageInt(3);
 
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
index b739153282..c4ca04c7f5 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
@@ -59,7 +59,7 @@ public class PhyrexianMetamorph extends CardImpl {
         super(ownerId, 42, "Phyrexian Metamorph", Rarity.RARE, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}{UP}");
         this.expansionSetCode = "NPH";
         this.subtype.add("Shapeshifter");
-        this.color.setBlue(true);
+
         this.power = new MageInt(0);
         this.toughness = new MageInt(0);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java
index a2f7fc241f..21e80c1428 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/HuntmasterOfTheFellsTest.java
@@ -38,7 +38,6 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain");
         addCard(Zone.HAND, playerA, "Huntmaster of the Fells");
-        addCard(Zone.BATTLEFIELD, playerB, "Ornithopter");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Huntmaster of the Fells");
         setStopAt(3, PhaseStep.DRAW);
@@ -49,7 +48,6 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase {
         assertPermanentCount(playerA, "Wolf", 1);
         assertPermanentCount(playerA, "Huntmaster of the Fells", 0);
         assertPermanentCount(playerA, "Ravager of the Fells", 1);
-        assertPermanentCount(playerB, "Ornithopter", 0);
     }
 
     /**
@@ -60,7 +58,6 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain");
         addCard(Zone.HAND, playerA, "Huntmaster of the Fells");
-        addCard(Zone.BATTLEFIELD, playerB, "Ornithopter");
 
         addCard(Zone.BATTLEFIELD, playerB, "Mountain", 2);
         addCard(Zone.HAND, playerB, "Lightning Bolt", 2);
@@ -76,6 +73,5 @@ public class HuntmasterOfTheFellsTest extends CardTestPlayerBase {
         assertPermanentCount(playerA, "Wolf", 2);
         assertPermanentCount(playerA, "Ravager of the Fells", 0); // transformed back
         assertPermanentCount(playerA, "Huntmaster of the Fells", 1);
-        assertPermanentCount(playerB, "Ornithopter", 0);
     }
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java
new file mode 100644
index 0000000000..1663f58511
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/ThragtuskTest.java
@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package org.mage.test.cards.triggers.dies;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * Thragtusk - Beast {4}{G}
+ * When Thragtusk enters the battlefield, you gain 5 life.
+ * When Thragtusk leaves the battlefield, put a 3/3 green Beast creature token onto the battlefield.
+ * 
+ * @author LevelX2
+ */
+public class ThragtuskTest extends CardTestPlayerBase {
+
+    /**
+     * Test if a Thragtusk is copied by a PhyrexianMetamorph
+     * that both triggers cotrrect work
+     */
+    @Test
+    public void testPhyrexianMetamorph() {
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
+        // You may have Phyrexian Metamorph enter the battlefield as a copy of any artifact or creature on the battlefield, except it's an artifact in addition to its other types
+        addCard(Zone.HAND, playerA, "Phyrexian Metamorph", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Swamp", 6);
+        addCard(Zone.HAND, playerB, "Public Execution", 1);
+        addCard(Zone.BATTLEFIELD, playerB, "Thragtusk", 1);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Phyrexian Metamorph");
+        setChoice(playerA, "Yes");        
+        setChoice(playerA, "Thragtusk");
+        
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Public Execution", "Thragtusk");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertPermanentCount(playerB, "Thragtusk", 1);
+
+        assertGraveyardCount(playerA,"Phyrexian Metamorph", 1);
+        assertGraveyardCount(playerB,"Public Execution", 1);
+
+        assertLife(playerA, 25);
+        assertLife(playerB, 20); // Thragtusk ETB ability does not trigger if set to battlefield on test game start 
+        
+        assertPermanentCount(playerA, "Beast", 1);                
+
+    }
+}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/mage/abilities/TriggeredAbilityImpl.java
index 039a86230a..e6c95e0eca 100644
--- a/Mage/src/mage/abilities/TriggeredAbilityImpl.java
+++ b/Mage/src/mage/abilities/TriggeredAbilityImpl.java
@@ -183,7 +183,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
                 // case LOST_CONTROL:
                 case PHASED_OUT:
                 case PHASED_IN:
-                if (game.getLastKnownInformation(getSourceId(), zone) != null) {
+                if (this.zone == Zone.ALL || game.getLastKnownInformation(getSourceId(), zone) != null) {
                     return true;
                 }
             }