diff --git a/res/cardsfolder/a/admonition_angel.txt b/res/cardsfolder/a/admonition_angel.txt
index d8357e46ed5..77415cc41b3 100644
--- a/res/cardsfolder/a/admonition_angel.txt
+++ b/res/cardsfolder/a/admonition_angel.txt
@@ -1,17 +1,16 @@
 Name:Admonition Angel
 ManaCost:3 W W W
 Types:Creature Angel
-Text:(NOTE: This spell is rather buggy and should not be used at this time.)
+Text:no text
 PT:6/6
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than CARDNAME.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
 SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Permanent.Other+nonLand | TgtPrompt$ Choose target nonland permanent other than Admonition Angel. | RememberTargets$ True | Origin$ Battlefield | Destination$ Exile
-SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
-SVar:RemAIDeck:True
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | SubAbility$ DBCleanup | Destination$ Battlefield
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Land
-SVar:RemAIDeck:True
-SVar:Rarity:None
+SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/admonition_angel.jpg
 SetInfo:WWK|Mythic|http://magiccards.info/scans/en/wwk/1.jpg
 Oracle:Flying\nLandfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.\nWhen Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
index 5e90df6d4a2..85fc948749a 100644
--- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
+++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java
@@ -179,6 +179,9 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn
         out.setEnchanting(in.getEnchanting());
         out.setClones(in.getClones());
         out.setCounters(in.getCounters());
+        for(Object o:in.getRemembered()) {
+            out.addRemembered(o);
+        }
         
         out.clearTriggersNew();
         for(Trigger trigger : in.getTriggers()) {