diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java
index c5cb642b856..ba25d1541f0 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/TimeOfHeroes.java
@@ -34,12 +34,12 @@ import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.common.continious.BoostAllEffect;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
-import mage.abilities.effects.common.continious.BoostAllEffect;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.CounterPredicate;
 import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.filter.predicate.permanent.CounterPredicate;
 
 /**
  *
diff --git a/Mage/src/mage/filter/predicate/mageobject/CounterPredicate.java b/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
similarity index 80%
rename from Mage/src/mage/filter/predicate/mageobject/CounterPredicate.java
rename to Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
index a2a258c2cf4..1096383d4d2 100644
--- a/Mage/src/mage/filter/predicate/mageobject/CounterPredicate.java
+++ b/Mage/src/mage/filter/predicate/permanent/CounterPredicate.java
@@ -25,9 +25,8 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.filter.predicate.mageobject;
+package mage.filter.predicate.permanent;
 
-import mage.MageObject;
 import mage.counters.CounterType;
 import mage.filter.predicate.Predicate;
 import mage.game.Game;
@@ -37,7 +36,7 @@ import mage.game.permanent.Permanent;
  *
  * @author jeff
  */
-public class CounterPredicate implements Predicate<MageObject> {
+public class CounterPredicate implements Predicate<Permanent> {
 
     private final CounterType counter;
 
@@ -46,16 +45,12 @@ public class CounterPredicate implements Predicate<MageObject> {
     }
 
     @Override
-    public boolean apply(MageObject input, Game game) {
-        Permanent permanent = game.getPermanent(input.getId());
-        if (permanent != null) {
-            return permanent.getCounters().containsKey(counter);
-        }
-        return false;
+    public boolean apply(Permanent input, Game game) {
+        return input.getCounters().containsKey(counter);
     }
 
     @Override
     public String toString() {
-        return "Counter Type(" + counter.getName() + ')';
+        return "CounterType(" + counter.getName() + ')';
     }
 }