diff --git a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
index 12536f21c3f..4aea82e3967 100644
--- a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
+++ b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
@@ -94,12 +94,12 @@ public class CreatureEvaluator implements Function<Card, Integer> {
             if (c.hasKeyword(Keyword.VIGILANCE)) {
                 value += addValue((power * 5) + (toughness * 5), "vigilance");
             }
-            if (c.hasKeyword(Keyword.WITHER)) {
-                value += addValue(power * 10, "Wither");
-            }
             if (c.hasKeyword(Keyword.INFECT)) {
                 value += addValue(power * 15, "infect");
             }
+            else if (c.hasKeyword(Keyword.WITHER)) {
+                value += addValue(power * 10, "Wither");
+            }
             value += addValue(c.getKeywordMagnitude(Keyword.RAMPAGE), "rampage");
             value += addValue(c.getKeywordMagnitude(Keyword.AFFLICT) * 5, "afflict");
         }
diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java
index e8a9b4ff2ac..360c69a54b8 100644
--- a/forge-game/src/main/java/forge/game/cost/CostTapType.java
+++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java
@@ -184,7 +184,7 @@ public class CostTapType extends CostPartWithList {
         }
 
         final int amount = this.getAbilityAmount(ability);
-        return typeList.size() != 0 && typeList.size() >= amount;
+        return typeList.size() >= amount;
     }
 
     /* (non-Javadoc)