diff --git a/Mage.Sets/src/mage/sets/commander2014/Willbender.java b/Mage.Sets/src/mage/sets/commander2014/Willbender.java
index c673f9b76f6..4df94aaa83b 100644
--- a/Mage.Sets/src/mage/sets/commander2014/Willbender.java
+++ b/Mage.Sets/src/mage/sets/commander2014/Willbender.java
@@ -37,7 +37,7 @@ import mage.abilities.keyword.MorphAbility;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.filter.FilterSpell;
+import mage.filter.FilterStackObject;
 import mage.filter.predicate.mageobject.NumberOfTargetsPredicate;
 import mage.target.TargetStackObject;
 
@@ -47,10 +47,10 @@ import mage.target.TargetStackObject;
  */
 public class Willbender extends CardImpl {
 
-    private static final FilterSpell filter = new FilterSpell("spell with a single target");
+    private static final FilterStackObject FILTER = new FilterStackObject("spell or ability with a single target");
 
     static {
-        filter.add(new NumberOfTargetsPredicate(1));
+        FILTER.add(new NumberOfTargetsPredicate(1));
     }
 
     public Willbender(UUID ownerId) {
@@ -66,7 +66,7 @@ public class Willbender extends CardImpl {
         this.addAbility(new MorphAbility(this, new ManaCostsImpl("{1}{U}")));
         // When Willbender is turned face up, change the target of target spell or ability with a single target.
         Ability ability = new TurnedFaceUpSourceTriggeredAbility(new ChooseNewTargetsTargetEffect(true, true));
-        ability.addTarget(new TargetStackObject(filter));
+        ability.addTarget(new TargetStackObject(FILTER));
         this.addAbility(ability);
 
     }
diff --git a/Mage/src/main/java/mage/filter/FilterStackObject.java b/Mage/src/main/java/mage/filter/FilterStackObject.java
index a7c478bd78a..deceb91a83f 100644
--- a/Mage/src/main/java/mage/filter/FilterStackObject.java
+++ b/Mage/src/main/java/mage/filter/FilterStackObject.java
@@ -44,7 +44,7 @@ import mage.game.stack.StackObject;
  */
 public class FilterStackObject extends FilterObject<StackObject> {
 
-    protected List<ObjectPlayerPredicate<ObjectPlayer<Permanent>>> extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Permanent>>>();
+    protected List<ObjectPlayerPredicate<ObjectPlayer<Permanent>>> extraPredicates = new ArrayList<>();
 
     public FilterStackObject() {
         super("spell or ability");