diff --git a/localization/en-us.lua b/localization/en-us.lua
index 04b05cb..6923f85 100644
--- a/localization/en-us.lua
+++ b/localization/en-us.lua
@@ -381,7 +381,7 @@ return {
             ch_c_Roland_Eternally_Crimson = {"{C:attention}Crimson Heart{}'s effect is active every blind"},
             ch_c_Roland_Eternally_Verdant = {"{C:attention}Verdant Leaf{}'s effect is active every blind"},
             ch_c_Roland_Eternally_Violet = {"{C:attention}Violet Vessel{}'s effect is active every blind"},
-            ch_c_Roland_Jokerful = {"Only the {C:common}default Joker{} can appear in shops"},
+            ch_c_Roland_Jokerful = {"The only jokers are {C:mult}Joker{} and {C:chips}Ms. Joker"},
             ch_c_Roland_Ornate = {"Anything vanilla is banned"},
             ch_c_Roland_Pastries = {"All blinds, cards, and tags are of {C:gold}Bakery{} or {C:blue}Roland"},
             ch_c_Roland_Showdown = {"Showdown blinds are {C:attention}Venerable Visage"},
diff --git a/src/challenge.lua b/src/challenge.lua
index 802485a..8d122a3 100644
--- a/src/challenge.lua
+++ b/src/challenge.lua
@@ -11,7 +11,7 @@ local function adder(tbl)
 end
 
 local function is_banned_from_pastry(v)
-    return not ({Bakery = true, Roland = true})[(v.mod or {}).id]
+    return not ({Bakery = true, Roland = true})[(v.mod or {}).key]
 end
 
 local function is_center_banned_from_pastry(v)
@@ -20,7 +20,7 @@ local function is_center_banned_from_pastry(v)
 end
 
 local function is_joker(v)
-    return v.set == "Joker"
+    return v.set == "Joker" and not ({j_joker = true, j_Roland_msjoker = true})[v.id]
 end
 
 local function is_showdown_except(key)