diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index dbca83578bf..128fda49866 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -6077,9 +6077,7 @@ public class CardFactory implements NewConstants {
                         input[0] = JOptionPane.showInputDialog(null, "Which creature type?", "Pick type",
                                 JOptionPane.QUESTION_MESSAGE);
                         
-                        if(input[0].equals("Legendary") || input[0].equals("Artifact")
-                                || input[0].equals("Enchantment") || input[0].equals("Shrine")
-                                || input[0].equals("Creature")) input[0] = "";
+                        if(!CardUtil.isCreatureType(input[0])) input[0] = "";
                         //TODO: some more input validation, case-sensitivity, etc.
                         
                         input[0] = input[0].trim(); //this is to prevent "cheating", and selecting multiple creature types,eg "Goblin Soldier"
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index aa9e7ca2b3f..ac99737cb11 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -4010,9 +4010,7 @@ public class CardFactoryUtil {
             ArrayList<String> typeList = c.getType();
             
             for(String var:typeList) {
-                if(var.equals("Creature") || var.equals("Artifact") || var.equals("Land") || var.equals("Tribal")
-                        || var.equals("Enchantment") || var.equals("Legendary")) ;
-                else if(!map.containsKey(var)) map.put(var, 1);
+                if(CardUtil.isCreatureType(var) && !map.containsKey(var)) map.put(var, 1);
                 else {
                     map.put(var, map.get(var) + 1);
                 }