diff --git a/Mage.Sets/src/mage/cards/c/CadricSoulKindler.java b/Mage.Sets/src/mage/cards/c/CadricSoulKindler.java
index 3b29126634..4437637fad 100644
--- a/Mage.Sets/src/mage/cards/c/CadricSoulKindler.java
+++ b/Mage.Sets/src/mage/cards/c/CadricSoulKindler.java
@@ -16,6 +16,7 @@ import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.filter.FilterPermanent;
 import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
 import mage.filter.predicate.permanent.TokenPredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -35,6 +36,7 @@ public final class CadricSoulKindler extends CardImpl {
 
     static {
         filter.add(TokenPredicate.FALSE);
+        filter.add(AnotherPredicate.instance);
         filter.add(SuperType.LEGENDARY.getPredicate());
     }
 
@@ -52,7 +54,7 @@ public final class CadricSoulKindler extends CardImpl {
 
         // Whenever another nontoken legendary permanent enters the battlefield under your control, you may pay {1}. If you do, create a token that's a copy of it. That token gains haste. Sacrifice it at the beginning of the next end step.
         this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
-                new DoIfCostPaid(new CadricSoulKindlerLegendEffect(), new GenericManaCost(1)), filter
+                new DoIfCostPaid(new CadricSoulKindlerTokenEffect(), new GenericManaCost(1)), filter
         ));
     }
 
@@ -92,24 +94,23 @@ class CadricSoulKindlerLegendEffect extends ContinuousRuleModifyingEffectImpl {
         Permanent permanent = game.getPermanent(event.getTargetId());
         return permanent instanceof PermanentToken && permanent.isControlledBy(source.getControllerId());
     }
-
 }
 
-class CadricSoulKindlerEffect extends OneShotEffect {
+class CadricSoulKindlerTokenEffect extends OneShotEffect {
 
-    CadricSoulKindlerEffect() {
+    CadricSoulKindlerTokenEffect() {
         super(Outcome.Benefit);
         staticText = "create a token that's a copy of it. " +
                 "That token gains haste. Sacrifice it at the beginning of the next end step";
     }
 
-    private CadricSoulKindlerEffect(final CadricSoulKindlerEffect effect) {
+    private CadricSoulKindlerTokenEffect(final CadricSoulKindlerTokenEffect effect) {
         super(effect);
     }
 
     @Override
-    public CadricSoulKindlerEffect copy() {
-        return new CadricSoulKindlerEffect(this);
+    public CadricSoulKindlerTokenEffect copy() {
+        return new CadricSoulKindlerTokenEffect(this);
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
index 4500ff169c..af1f68a31d 100644
--- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldAllTriggeredAbility.java
@@ -90,18 +90,15 @@ public class EntersBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
         }
         this.getEffects().setValue("permanentEnteringBattlefield", permanent);
         this.getEffects().setValue("permanentEnteringControllerId", permanent.getControllerId());
-        if (setTargetPointer == SetTargetPointer.NONE) {
-            return true;
-        }
         switch (setTargetPointer) {
             case PLAYER:
                 this.getEffects().setTargetPointer(new FixedTarget(permanent.getControllerId()));
-                break;
+                return true;
             case PERMANENT:
                 this.getEffects().setTargetPointer(new FixedTarget(permanent, game));
-                break;
+            default:
+                return true;
         }
-        return true;
     }
 
     @Override