diff --git a/manifest.json b/manifest.json
index 1503dad..8f7280d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
     "author": [
         "Emik"
     ],
-    "version": "2.7.0",
+    "version": "2.7.1",
     "badge_colour": "8BE9FD",
     "main_file": "src/main.lua",
     "badge_text_colour": "44475A",
diff --git a/src/challenge.lua b/src/challenge.lua
index eb6194b..b6b2c85 100644
--- a/src/challenge.lua
+++ b/src/challenge.lua
@@ -247,7 +247,9 @@ SMODS.Challenge {
 
 q(function()
     if not G.P_CENTERS.j_Bakery_Spinner then
-        spin_to_win.jokers = nil
+        f(spin_to_win.jokers):each(function(v)
+            v.id = "j_joker"
+        end)
     end
 
     f {
diff --git a/src/tweaks.lua b/src/tweaks.lua
index 72ca20d..46e1fb8 100644
--- a/src/tweaks.lua
+++ b/src/tweaks.lua
@@ -68,14 +68,13 @@ function G.FUNCS.use_card(e, ...)
         area = e.config.ref_table.from_area,
     }
 
-    local normal = e.config.ref_table.area ~= G.pack_cards
+    local normal = G.GAME.pack_choices and e.config.ref_table.area ~= G.pack_cards
     e.config.ref_table:remove()
 
     if normal then
         return
     end
 
-    e.config.ref_table:remove()
     G.GAME.pack_choices = G.GAME.pack_choices - 1
     local _ = G.GAME.pack_choices <= 0 and G.FUNCS.end_consumeable()
 end