diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
index e53b717fb7b..206fffaa29b 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
@@ -356,7 +356,7 @@ public class GameCopier {
 
             newCard.setChangedCardTypes(c.getChangedCardTypesTable());
             newCard.setChangedCardTypesCharacterDefining(c.getChangedCardTypesCharacterDefiningTable());
-            newCard.setChangedCardKeywords(c.getChangedCardKeywords(), true);
+            newCard.setChangedCardKeywords(c.getChangedCardKeywords());
             newCard.setChangedCardNames(c.getChangedCardNames());
 
             for (Table.Cell<Long, Long, List<String>> kw : c.getHiddenExtrinsicKeywordsTable().cellSet()) {
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 27ede8ab54d..6a7f9726588 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -6876,19 +6876,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         this.changedCardTypesCharacterDefining.putAll(changedCardTypes);
     }
 
-    public void setChangedCardKeywords(Table<Long, Long, KeywordsChange> changedCardKeywords, boolean copy) {
+    public void setChangedCardKeywords(Table<Long, Long, KeywordsChange> changedCardKeywords) {
         this.changedCardKeywords.clear();
         for (Table.Cell<Long, Long, KeywordsChange> entry : changedCardKeywords.cellSet()) {
-            KeywordsChange result = entry.getValue();
-            if (copy) {
-                result = result.copy(this, true);
-            } else {
-                // do not copy the keywords, just update the host
-                for (KeywordInterface k : result.getKeywords()) {
-                    k.setHostCard(this);
-                }
-            }
-            this.changedCardKeywords.put(entry.getRowKey(), entry.getColumnKey(), result);
+            this.changedCardKeywords.put(entry.getRowKey(), entry.getColumnKey(), entry.getValue().copy(this, true));
         }
     }
 
diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java
index 96ded79da40..6b266177464 100644
--- a/forge-game/src/main/java/forge/game/card/CardUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardUtil.java
@@ -287,7 +287,7 @@ public final class CardUtil {
 
         newCopy.setChangedCardColors(in.getChangedCardColorsTable());
         newCopy.setChangedCardColorsCharacterDefining(in.getChangedCardColorsCharacterDefiningTable());
-        newCopy.setChangedCardKeywords(in.getChangedCardKeywords(), true);
+        newCopy.setChangedCardKeywords(in.getChangedCardKeywords());
         newCopy.setChangedCardTypes(in.getChangedCardTypesTable());
         newCopy.setChangedCardTypesCharacterDefining(in.getChangedCardTypesCharacterDefiningTable());
         newCopy.setChangedCardNames(in.getChangedCardNames());