diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java b/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java
index b84275e11c1..9aaa8309c67 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/Whipflare.java
@@ -27,13 +27,14 @@
  */
 package mage.sets.newphyrexia;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DamageAllEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
@@ -44,7 +45,6 @@ public class Whipflare extends CardImpl<Whipflare> {
 
     static {
         filter.getNotCardType().add(CardType.ARTIFACT);
-        filter.setNotCardType(true);
     }
 
     public Whipflare(UUID ownerId) {
@@ -52,6 +52,8 @@ public class Whipflare extends CardImpl<Whipflare> {
         this.expansionSetCode = "NPH";
 
         this.color.setRed(true);
+
+        // Whipflare deals 2 damage to each nonartifact creature.
         this.getSpellAbility().addEffect(new DamageAllEffect(2, filter));
     }
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java
new file mode 100644
index 00000000000..ee12910a7f8
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/filters/WhipflareTest.java
@@ -0,0 +1,38 @@
+package org.mage.test.cards.filters;
+
+import mage.Constants;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author noxx
+ */
+public class WhipflareTest extends CardTestPlayerBase {
+
+    @Test
+    public void testDealDamage() {
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2);
+        addCard(Constants.Zone.HAND, playerA, "Whipflare");
+
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard", 2);
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Myr Enforcer", 2);
+        addCard(Constants.Zone.BATTLEFIELD, playerB, "Elite Vanguard", 2);
+        addCard(Constants.Zone.BATTLEFIELD, playerB, "Myr Enforcer", 2);
+
+        castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Whipflare");
+
+        setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT);
+        execute();
+        
+        assertLife(playerA, 20);
+        assertLife(playerB, 20);
+
+        assertPermanentCount(playerA, "Elite Vanguard", 0);
+        assertPermanentCount(playerA, "Myr Enforcer", 2);
+        assertPermanentCount(playerB, "Elite Vanguard", 0);
+        assertPermanentCount(playerA, "Myr Enforcer", 2);
+    }
+
+
+}