diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index a57d940bc40..2ff72428be1 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -156,9 +156,9 @@ public abstract class SpellAbilityEffect {
             if ("}".equals(t)) { isPlainText = true; continue; }
 
             if (isPlainText) {
-                if(t.startsWith("NICKNAME")) {
+                if (t.startsWith("NICKNAME")) {
                     sb.append(TextUtil.fastReplace(t,"NICKNAME", sa.getHostCard().getName().split(",")[0]));
-                } else {
+                } else if (t.startsWith("CARDNAME")) {
                     sb.append(TextUtil.fastReplace(t, "CARDNAME", sa.getHostCard().getName()));
                 }
             } else {