diff --git a/forge-game/src/main/java/forge/game/card/CardState.java b/forge-game/src/main/java/forge/game/card/CardState.java
index d3f7d38698f..cfa1ded4cf5 100644
--- a/forge-game/src/main/java/forge/game/card/CardState.java
+++ b/forge-game/src/main/java/forge/game/card/CardState.java
@@ -172,6 +172,7 @@ public class CardState extends GameObject {
         for (KeywordInterface k : intrinsicKeyword0) {
             intrinsicKeywords.insert(k.copy(card, lki));
         }
+        card.updateKeywordsCache(this);
     }
 
     public final KeywordInterface addIntrinsicKeyword(final String s, boolean initTraits) {
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
index 8800168fe1e..b17702c0536 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
@@ -174,6 +174,8 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
         if (!lki) {
             res.setId(nextId());
         }
+        
+        res.setHostCard(host);
 
         res.setActiveZone(validHostZones);
         res.setLayer(getLayer());