diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
index 5a3cf3ae6fe..1df0f434caa 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
@@ -140,7 +140,8 @@ public class CardPluginImpl implements CardPlugin {
         for (MageCard card : cards.values()) {
             MagePermanent perm = (MagePermanent) card.getMainPanel(); // all cards must be MagePermanent on battlefield
 
-            if (!rowType.isType(perm) || perm.getOriginalPermanent().isAttachedToPermanent()) {
+            if (!rowType.isType(perm) || perm.getOriginalPermanent().isAttachedToPermanent()
+                    || (perm.isCreature() && !rowType.equals(RowType.creature))) {
                 continue;
             }