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 35ef4469f01..8fc4114e6bf 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1274,7 +1274,7 @@ public class CardFactoryUtil {
         }
 
         if (sq[0].contains("CardControllerTypes")) {
-            return doXMath(getCardTypesFromList(cc.getCardsIn(ZoneType.smartValueOf(sq[1]))), m, c);
+            return doXMath(getCardTypesFromList(cc.getCardsIn(ZoneType.listValueOf(sq[1]))), m, c);
         }
 
         if (sq[0].contains("CardTypes")) {
diff --git a/forge-gui/res/cardsfolder/upcoming/happily_ever_after.txt b/forge-gui/res/cardsfolder/upcoming/happily_ever_after.txt
new file mode 100644
index 00000000000..d1c2e4c854f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/happily_ever_after.txt
@@ -0,0 +1,13 @@
+Name:Happily Ever After
+ManaCost:2 W
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, each player gains 5 life and draws a card.
+SVar:TrigGainLife:DB$ GainLife | Defined$ Player | LifeAmount$ 5 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ Player | NumCards$ 1
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ Z | SVarCompare$ EQ11 | LifeTotal$ You | LifeAmount$ GEW | References$ X,Y,Z,W | Execute$ TrigWin | TriggerDescription$ At the beginning of your upkeep, if there are five colors among permanents you control, there are six or more card types among permanents you control and/or cards in your graveyard, and your life total is greater than or equal to your starting life total, you win the game.
+SVar:TrigWin:DB$ WinsGame | Defined$ You
+SVar:X:Count$ColorsCtrl Permanent.YouCtrl+inZoneBattlefield/LimitMax.5
+SVar:Y:Count$CardControllerTypes.Battlefield,Graveyard/LimitMax.6
+SVar:Z:SVar$X/Plus.Y
+SVar:W:Count$YourStartingLife
+Oracle:When Happily Ever After enters the battlefield, each player gains 5 life and draws a card.\nAt the beginning of your upkeep, if there are five colors among permanents you control, there are six or more card types among permanents you control and/or cards in your graveyard, and your life total is greater than or equal to your starting life total, you win the game.