diff --git a/res/cardsfolder/a/aegis_angel.txt b/res/cardsfolder/a/aegis_angel.txt
index d87a5382b32..28f0486569b 100644
--- a/res/cardsfolder/a/aegis_angel.txt
+++ b/res/cardsfolder/a/aegis_angel.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, another target permanent is indestructible for as long as you control CARDNAME. (Effects that say "destroy" don't destroy that permanent. An indestructible creature can't be destroyed by damage.)
-SVar:TrigPump:DB$ Pump | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ HIDDEN Indestructible | UntilLoseControlOfHost$ True
+SVar:TrigPump:AB$ Pump |  Cost$ 0 | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent  | KW$ HIDDEN Indestructible | UntilLoseControlOfHost$ True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aegis_angel.jpg
diff --git a/src/main/java/forge/card/abilityfactory/ai/PumpAi.java b/src/main/java/forge/card/abilityfactory/ai/PumpAi.java
index 2afefa6f5d0..945fc1f157f 100644
--- a/src/main/java/forge/card/abilityfactory/ai/PumpAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/PumpAi.java
@@ -207,7 +207,7 @@ public class PumpAi extends PumpAiBase {
             }
         }
 
-        list = CardLists.getValidCards(list, tgt.getValidTgts(), sa.getActivatingPlayer(), sa.getSourceCard());
+        list = CardLists.getValidCards(list, tgt.getValidTgts(), ai, sa.getSourceCard());
         if (Singletons.getModel().getGame().getStack().size() == 0) {
             // If the cost is tapping, don't activate before declare
             // attack/block
diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java
index b14229aa66a..eb02de9259c 100644
--- a/src/main/java/forge/card/spellability/Target.java
+++ b/src/main/java/forge/card/spellability/Target.java
@@ -674,7 +674,8 @@ public class Target {
      */
     public final boolean canTgtCreature() {
         for (final String s : this.validTgts) {
-            if ((s.contains("Creature") || CardUtil.isACreatureType(s)) && !s.contains("nonCreature")) {
+            if ((s.contains("Creature") || CardUtil.isACreatureType(s) || s.startsWith("Permanent")) 
+                    && !s.contains("nonCreature")) {
                 return true;
             }
         }