diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index 5fb038ab9a9..f0b0813bfc3 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -343,6 +343,17 @@ public final class StaticAbilityContinuous {
                 }
             });
             addTypes.addAll(newTypes);
+
+            addTypes = Lists.transform(addTypes, new Function<String, String>() {
+                @Override
+                public String apply(String input) {
+                    if (hostCard.hasChosenType()) {
+                        input = input.replaceAll("ChosenType", hostCard.getChosenType());
+                    }
+                    return input;
+                }
+
+            });
         }
 
         if (layer == StaticAbilityLayer.TYPE && params.containsKey("RemoveType")) {
diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
index 288b62b0fe7..6ade05b1eb0 100644
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
@@ -2158,6 +2158,7 @@ public class GameSimulatorTest extends SimulationTestCase {
         simGame.getPhaseHandler().devAdvanceToPhase(PhaseType.MAIN2);
 
         assertEquals(21, simGame.getPlayers().get(0).getLife());
+        assertEquals(true, simGoblin.isRed() && simGoblin.isBlack());
         assertEquals(true, simGoblin.getType().hasSubtype("Zombie"));
     }
 }