diff --git a/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java b/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java
index 532f5d829c5..e3e24edaa2c 100644
--- a/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java
+++ b/Mage.Sets/src/mage/cards/f/ForgeOfHeroes.java
@@ -86,11 +86,12 @@ class ForgeOfHeroesEffect extends OneShotEffect {
             new AddCountersTargetEffect(
                     CounterType.P1P1.createInstance()
             ).apply(game, source);
-        }
-        if (permanent.isPlaneswalker()) {
+        } else if (permanent.isPlaneswalker()) {
             new AddCountersTargetEffect(
                     CounterType.LOYALTY.createInstance()
             ).apply(game, source);
+        } else {
+            return false;
         }
         return true;
     }
diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java
index a36e3bdffb0..8be4989a9fd 100644
--- a/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java
+++ b/Mage/src/main/java/mage/filter/predicate/permanent/CommanderPredicate.java
@@ -19,13 +19,12 @@ public class CommanderPredicate implements Predicate<Permanent> {
     @Override
     public boolean apply(Permanent input, Game game) {
         Player owner = game.getPlayer(input.getOwnerId());
-        return input.isCreature()
-                && owner != null
+        return owner != null
                 && owner.getCommandersIds().contains(input.getId());
     }
 
     @Override
     public String toString() {
-        return "Commander creature";
+        return "Commander";
     }
 }