diff --git a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java
index 5d029b5027f..0835c04b638 100644
--- a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java
@@ -30,9 +30,8 @@ package mage.filter.predicate.mageobject;
 import mage.MageObject;
 import mage.abilities.Abilities;
 import mage.abilities.Ability;
-import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.ActivatedAbilityImpl;
 import mage.abilities.costs.Cost;
-import mage.abilities.costs.common.DiscardCardCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.cards.Card;
 import mage.filter.predicate.Predicate;
@@ -62,8 +61,9 @@ public class AbilityPredicate implements Predicate<MageObject> {
         for (Ability ability : abilities) {
             if (abilityClass.equals(ability.getClass())) {
                 //Burseg Hack: Magewright's Stone [DIS] specifically looks for activated ability containing {T}
-                //As of 9/13/2015, no other AbilityPredicate is filtering for SimpleActivatedAbility 
-                if (abilityClass.equals(SimpleActivatedAbility.class) && ability.getCosts().size() > 0){
+                //As of 9/13/2015, no other AbilityPredicate is filtering for ActivatedAbilityImpl 
+                //if (abilityClass.equals(SimpleActivatedAbility.class) && ability.getCosts().size() > 0){
+                if((ability instanceof ActivatedAbilityImpl) && ability.getCosts().size() > 0){
                     for (Cost cost : ability.getCosts()) {
                         if (cost instanceof TapSourceCost) {
                             return true;