diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java
index 61c44ebdd8..1fcbecd2d8 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ChampionsDrake.java
@@ -36,12 +36,11 @@ import mage.abilities.condition.common.PermanentHasCounterCondition;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreaturePermanent;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.constants.Zone;
-
+import mage.filter.common.FilterControlledCreaturePermanent;
 
 /**
  *
@@ -64,7 +63,7 @@ public class ChampionsDrake extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Champion's Drake gets +3/+3 as long as you control a creature with three or more level counters on it.
-        ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentHasCounterCondition(CounterType.LEVEL, 2, new FilterCreaturePermanent(), PermanentHasCounterCondition.CountType.MORE_THAN), rule);
+        ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentHasCounterCondition(CounterType.LEVEL, 2, new FilterControlledCreaturePermanent(), PermanentHasCounterCondition.CountType.MORE_THAN), rule);
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
     }
 
diff --git a/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java
index b20f5d4b77..16d45219dc 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/PermanentHasCounterCondition.java
@@ -41,9 +41,10 @@ import java.util.List;
  */
 public class PermanentHasCounterCondition implements Condition {
 
-    public static enum CountType {MORE_THAN, FEWER_THAN, EQUAL_TO}
+    public static enum CountType {
+        MORE_THAN, FEWER_THAN, EQUAL_TO
+    };
 
-    ;
     private CounterType counterType;
     private int amount;
     private FilterPermanent filter;
@@ -62,30 +63,26 @@ public class PermanentHasCounterCondition implements Condition {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        boolean conditionApplies = false;
-        List<Permanent> permanents = game.getBattlefield().getAllActivePermanents(this.filter, source.getControllerId(), game);
+        List<Permanent> permanents = game.getBattlefield().getActivePermanents(this.filter, source.getControllerId(), game);
         for (Permanent permanent : permanents) {
             switch (this.type) {
                 case FEWER_THAN:
                     if (permanent.getCounters(game).getCount(this.counterType) < this.amount) {
-                        conditionApplies = true;
-                        break;
+                        return true;
                     }
                     break;
                 case MORE_THAN:
                     if (permanent.getCounters(game).getCount(this.counterType) > this.amount) {
-                        conditionApplies = true;
-                        break;
+                        return true;
                     }
                     break;
                 case EQUAL_TO:
                     if (permanent.getCounters(game).getCount(this.counterType) == this.amount) {
-                        conditionApplies = true;
-                        break;
+                        return true;
                     }
                     break;
             }
         }
-        return conditionApplies;
+        return false;
     }
 }