diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java
index 6ff536eac70..8e1a4856b7c 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java
@@ -85,19 +85,18 @@ public abstract class TokenEffectBase extends SpellAbilityEffect {
             c.updateStateForView();
 
             if (sa.hasParam("RememberTokens")) {
-                game.getCardState(sa.getHostCard()).addRemembered(c);
+                host.addRemembered(c);
             }
             if (sa.hasParam("ImprintTokens")) {
-                game.getCardState(sa.getHostCard()).addImprintedCard(c);
+                host.addImprintedCard(c);
             }
             if (sa.hasParam("RememberSource")) {
-                game.getCardState(c).addRemembered(host);
+                c.addRemembered(host);
             }
             if (sa.hasParam("TokenRemembered")) {
-                final Card token = game.getCardState(c);
                 final String remembered = sa.getParam("TokenRemembered");
                 for (final Object o : AbilityUtils.getDefinedObjects(host, remembered, sa)) {
-                    token.addRemembered(o);
+                    c.addRemembered(o);
                 }
             }
             allTokens.add(c);
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 0053e0e1dad..91b2b0f4448 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -4374,7 +4374,7 @@ public class CardFactoryUtil {
             final String manacost = k[1];
 
             String effect = "AB$ RepeatEach | Cost$ " + manacost + " ExileFromGrave<1/CARDNAME> " +
-                    "| ActivationZone$ Graveyard | RepeatPlayers$ Opponent" +
+                    "| ActivationZone$ Graveyard | ClearRememberedBeforeLoop$ True | RepeatPlayers$ Opponent" +
                     "| PrecostDesc$ Encore | CostDesc$ " + ManaCostParser.parse(manacost) +
                     "| SpellDescription$ (" + inst.getReminderText() + ")";
 
@@ -4391,7 +4391,7 @@ public class CardFactoryUtil {
 
             final String sacStr = "DB$ SacrificeAll | Defined$ DelayTriggerRemembered";
 
-            final String cleanupStr = "DB$ Cleanup | ClearImprinted$ True";
+            final String cleanupStr = "DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True";
 
             final SpellAbility sa = AbilityFactory.getAbility(effect, card);
             sa.setIntrinsic(intrinsic);