diff --git a/res/cardsfolder/f/faiths_fetters.txt b/res/cardsfolder/f/faiths_fetters.txt
index c6a569a24fc..84e2924b950 100644
--- a/res/cardsfolder/f/faiths_fetters.txt
+++ b/res/cardsfolder/f/faiths_fetters.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Enchantment Aura
 Text:no text
 K:Enchant permanent
-A:SP$ Attach | Cost$ 3 W | ValidTgts$ Permanent | AILogic$ Curse
+A:SP$ Attach | Cost$ 3 W | ValidTgts$ Permanent | AITgts$ Creature | AILogic$ Curse
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 4 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | LifeAmount$ 4
 S:Mode$ CantBeActivated | ValidCard$ Card.EnchantedBy | NonMana$ True | Description$ Enchanted permanent's activated abilities can't be activated unless they're mana abilities. If enchanted permanent is a creature, it can't attack or block.
diff --git a/res/cardsfolder/s/stasis_cocoon.txt b/res/cardsfolder/s/stasis_cocoon.txt
index 19b22a54171..965cf876701 100644
--- a/res/cardsfolder/s/stasis_cocoon.txt
+++ b/res/cardsfolder/s/stasis_cocoon.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Enchantment Aura
 Text:no text
 K:Enchant artifact
-A:SP$ Attach | Cost$ 1 W | ValidTgts$ Artifact | AILogic$ Curse
+A:SP$ Attach | Cost$ 1 W | ValidTgts$ Artifact | AITgts$ Creature,Card.hasActivatedAbility | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted artifact's activated abilities can't be activated. If enchanted artifact is a creature, it can't attack or block.
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME can't attack or block.
 SVar:Rarity:Common
diff --git a/res/cardsfolder/s/stupefying_touch.txt b/res/cardsfolder/s/stupefying_touch.txt
index d612962804a..04b6eb51659 100644
--- a/res/cardsfolder/s/stupefying_touch.txt
+++ b/res/cardsfolder/s/stupefying_touch.txt
@@ -3,11 +3,10 @@ ManaCost:1 U
 Types:Enchantment Aura
 Text:no text
 K:Enchant creature
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
+A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AITgts$ Card.hasActivatedAbility | AILogic$ Curse
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ HIDDEN CARDNAME's activated abilities can't be activated. | Description$ Enchanted creature's activated abilities can't be activated.
-SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stupefying_touch.jpg
 SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/48.jpg
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index bf1a06e8c09..a8faf52a712 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -7051,15 +7051,19 @@ public class Card extends GameEntity implements Comparable<Card> {
                 return false;
             }
         } else if (property.equals("hasActivatedAbilityWithTapCost")) {
-            boolean hasIt = false;
             for (final SpellAbility sa : this.getSpellAbilities()) {
                 if (sa.isAbility() && (sa.getPayCosts() != null) && sa.getPayCosts().getTap()) {
-                    hasIt = true;
+                    return true;
                 }
             }
-            if (!hasIt) {
-                return false;
+            return false;
+        } else if (property.equals("hasActivatedAbility")) {
+            for (final SpellAbility sa : this.getSpellAbilities()) {
+                if (sa.isAbility()) {
+                    return true;
+                }
             }
+            return false;
         } else if (property.equals("NoAbilities")) {
             if (!((this.getAbilityText().trim().equals("") || this.isFaceDown()) && (this.getUnhiddenKeyword().size() == 0))) {
                 return false;