diff --git a/res/cardsfolder/r/rage_nimbus.txt b/res/cardsfolder/r/rage_nimbus.txt
index ef8f0f4a3b4..da4b9b58d41 100644
--- a/res/cardsfolder/r/rage_nimbus.txt
+++ b/res/cardsfolder/r/rage_nimbus.txt
@@ -6,7 +6,6 @@ PT:5/3
 K:Defender
 K:Flying
 A:AB$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME attacks each turn if able. | IsCurse$ True | SpellDescription$ Target creature attacks this turn if able.
-SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rage_nimbus.jpg
 SetInfo:ROE|Rare|http://magiccards.info/scans/en/roe/160.jpg
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index ad8591282e5..a824e69f199 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -6070,7 +6070,11 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @return a boolean.
      */
     public final boolean hasKeyword(final String keyword) {
-        return getKeyword().contains(keyword);
+        String kw = new String(keyword);
+        if (kw.startsWith("HIDDEN")) {
+            kw = kw.substring(7);
+        }
+        return getKeyword().contains(kw);
     }
 
     /**
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
index 33e430a2b6a..015b168dab4 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
@@ -360,6 +360,9 @@ public class AbilityFactoryPump {
                 if (!this.containsCombatRelevantKeyword(this.keywords)
                         && AllZone.getPhase().isBefore(Constant.Phase.MAIN2)) {
                     list.clear(); // this keyword is not combat relevenat
+                } else if (this.keywords.get(0).equals("HIDDEN CARDNAME attacks each turn if able.") 
+                        && AllZone.getPhase().isPlayerTurn(AllZone.getComputerPlayer())) {
+                    list.clear();
                 }
 
                 list = list.filter(new CardListFilter() {