diff --git a/Mage.Sets/src/mage/sets/morningtide/Mutavault.java b/Mage.Sets/src/mage/sets/morningtide/Mutavault.java
index 752e1e98e7..de0bd84c38 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Mutavault.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Mutavault.java
@@ -74,9 +74,8 @@ class MutavaultToken extends Token {
     public MutavaultToken() {
         super("", "2/2 creature with all creature types");
         cardType.add(CardType.CREATURE);
-        subtype.add("Changling");
+        subtype.add(ChangelingAbility.ALL_CREATURE_TYPE);
         power = new MageInt(2);
         toughness = new MageInt(2);
-        this.addAbility(ChangelingAbility.getInstance());
     }
 }
diff --git a/Mage/src/mage/abilities/keyword/ChangelingAbility.java b/Mage/src/mage/abilities/keyword/ChangelingAbility.java
index f926362c67..08fe0c9488 100644
--- a/Mage/src/mage/abilities/keyword/ChangelingAbility.java
+++ b/Mage/src/mage/abilities/keyword/ChangelingAbility.java
@@ -44,7 +44,7 @@ import mage.abilities.StaticAbility;
  * @author nantuko
  */
 public class ChangelingAbility extends StaticAbility<ChangelingAbility> implements MageSingleton {
-
+    public static final String ALL_CREATURE_TYPE = "All Creature Type";
     private static final ChangelingAbility fINSTANCE =  new ChangelingAbility();
 
     private Object readResolve() throws ObjectStreamException {
diff --git a/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java b/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java
index 9c97346a18..46e051495e 100644
--- a/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java
@@ -46,7 +46,7 @@ public class SubtypePredicate implements Predicate<MageObject> {
 
     @Override
     public boolean apply(MageObject input, Game game) {
-        if (input.getAbilities().contains(ChangelingAbility.getInstance())) {
+        if (input.getAbilities().contains(ChangelingAbility.getInstance()) || input.getSubtype().contains(ChangelingAbility.ALL_CREATURE_TYPE)) {
             return true;
         }