diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java b/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java
index ee73a251b4..7ba3689bbd 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java
@@ -126,15 +126,18 @@ class SatyrFiredancerTriggeredAbility extends TriggeredAbilityImpl {
             MageObject damageSource = game.getObject(event.getSourceId());
             if (damageSource != null) {            
                 if (game.getOpponents(getControllerId()).contains(event.getTargetId())) {
-                    if (!(damageSource instanceof StackObject) || !handledStackObjects.contains(damageSource.getId())) {
-                        if (damageSource instanceof StackObject) {
-                            handledStackObjects.add(damageSource.getId());
+                    MageObject object = game.getObject(event.getSourceId());
+                    if (object.getCardType().contains(CardType.INSTANT) || object.getCardType().contains(CardType.SORCERY)) { 
+                        if (!(damageSource instanceof StackObject) || !handledStackObjects.contains(damageSource.getId())) {
+                            if (damageSource instanceof StackObject) {
+                                handledStackObjects.add(damageSource.getId());
+                            }
+                            for (Effect effect: this.getEffects()) {
+                                effect.setTargetPointer(new FixedTarget(event.getTargetId())); // used by adjust targets
+                                effect.setValue("damage", event.getAmount());
+                            }
+                            return true;
                         }
-                        for (Effect effect: this.getEffects()) {
-                            effect.setTargetPointer(new FixedTarget(event.getTargetId())); // used by adjust targets
-                            effect.setValue("damage", event.getAmount());
-                        }
-                        return true;
                     }
                 }
             }
diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java b/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java
index 52ebd8a8c8..e003a00225 100644
--- a/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java
+++ b/Mage.Sets/src/mage/sets/khansoftarkir/ZurgoHelmsmasher.java
@@ -58,9 +58,6 @@ public class ZurgoHelmsmasher extends CardImpl {
         this.subtype.add("Orc");
         this.subtype.add("Warrior");
 
-        this.color.setRed(true);
-        this.color.setBlack(true);
-        this.color.setWhite(true);
         this.power = new MageInt(7);
         this.toughness = new MageInt(2);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SatyrFiredancerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SatyrFiredancerTest.java
new file mode 100644
index 0000000000..b97cd37240
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/damage/SatyrFiredancerTest.java
@@ -0,0 +1,86 @@
+/*
+ *  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.abilities.oneshot.damage;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class SatyrFiredancerTest extends CardTestPlayerBase {
+
+    @Test
+    public void testDamageFromInstantToPlayer() {
+        // Whenever an instant or sorcery spell you control deals damage to an opponent, Satyr Firedancer deals that much damage to target creature that player controls.        
+        addCard(Zone.BATTLEFIELD, playerA, "Satyr Firedancer");
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        addCard(Zone.HAND, playerA, "Lightning Bolt");
+
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Lightning Bolt", playerB);
+        addTarget(playerA, "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 17);
+        
+        assertGraveyardCount(playerA, "Lightning Bolt", 1);
+        assertGraveyardCount(playerB, "Silvercoat Lion", 1);
+    }
+
+    @Test
+    public void testDamageFromAttackWontTrigger() {
+        // Whenever an instant or sorcery spell you control deals damage to an opponent, Satyr Firedancer deals that much damage to target creature that player controls.        
+        addCard(Zone.BATTLEFIELD, playerA, "Satyr Firedancer");
+        addCard(Zone.BATTLEFIELD, playerA, "Pillarfield Ox", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Silvercoat Lion");
+
+        attack(1, playerA, "Pillarfield Ox");        
+        addTarget(playerA, "Silvercoat Lion");
+
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+
+        assertLife(playerA, 20);
+        assertLife(playerB, 18);
+        
+        assertGraveyardCount(playerB, "Silvercoat Lion", 0);
+        assertPermanentCount(playerB, "Silvercoat Lion", 1);
+    }
+
+}