diff --git a/Mage.Sets/src/mage/cards/c/ChandrasFury.java b/Mage.Sets/src/mage/cards/c/ChandrasFury.java
index 98e752ca138..87f167a107f 100644
--- a/Mage.Sets/src/mage/cards/c/ChandrasFury.java
+++ b/Mage.Sets/src/mage/cards/c/ChandrasFury.java
@@ -1,14 +1,14 @@
-
 package mage.cards.c;
 
-import java.util.UUID;
-import mage.abilities.effects.common.DamageAllControlledTargetEffect;
-import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.DamageTargetAndAllControlledEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetPlayerOrPlaneswalker;
 
+import java.util.UUID;
+
 /**
  *
  * @author North
@@ -19,10 +19,8 @@ public final class ChandrasFury extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{R}");
 
         // Chandra's Fury deals 4 damage to target player and 1 damage to each creature that player controls.
-        this.getSpellAbility().addEffect(new DamageTargetEffect(4));
-        this.getSpellAbility().addEffect(new DamageAllControlledTargetEffect(1)
-                .setText("and 1 damage to each creature that player or that planeswalker's controller controls")
-        );
+        this.getSpellAbility().addEffect(new DamageTargetAndAllControlledEffect(4, 1,
+                StaticFilters.FILTER_PERMANENT_CREATURE));
         this.getSpellAbility().addTarget(new TargetPlayerOrPlaneswalker());
     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java
new file mode 100644
index 00000000000..843bd5609ce
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetAndAllControlledEffect.java
@@ -0,0 +1,73 @@
+package mage.abilities.effects.common;
+
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
+import mage.filter.FilterPermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ * @author xenohedron
+ */
+public class DamageTargetAndAllControlledEffect extends OneShotEffect {
+
+    private final int firstAmount;
+    private final int secondAmount;
+    private final FilterPermanent filter;
+
+    /**
+     * Deals simultaneous damage to the target and to each creature the target controls
+     */
+    public DamageTargetAndAllControlledEffect(int firstAmount, int secondAmount, FilterPermanent filter) {
+        super(Outcome.Damage);
+        this.firstAmount = firstAmount;
+        this.secondAmount = secondAmount;
+        this.filter = filter;
+    }
+
+    protected DamageTargetAndAllControlledEffect(final DamageTargetAndAllControlledEffect effect) {
+        super(effect);
+        this.firstAmount = effect.firstAmount;
+        this.secondAmount = effect.secondAmount;
+        this.filter = effect.filter.copy();
+    }
+
+    @Override
+    public DamageTargetAndAllControlledEffect copy() {
+        return new DamageTargetAndAllControlledEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
+        if (permanent != null) {
+            permanent.damage(firstAmount, source.getSourceId(), source, game);
+        } else {
+            Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
+            if (player != null) {
+                player.damage(firstAmount, source.getSourceId(), source, game);
+            }
+        }
+        Player controller = game.getPlayerOrPlaneswalkerController(getTargetPointer().getFirst(game, source));
+        if (controller != null) {
+            for (Permanent perm : game.getBattlefield().getAllActivePermanents(filter, controller.getId(), game)) {
+                perm.damage(secondAmount, source.getSourceId(), source, game, false, true);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public String getText(Mode mode) {
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
+        return "{this} deals " + firstAmount + "damage to " +
+                getTargetPointer().describeTargets(mode.getTargets(), "that creature") +
+                " and " + secondAmount + " damage to each " + filter.getMessage() +
+                " that player or that planeswalker's controller controls";
+    }
+}