diff --git a/manifest.json b/manifest.json
index 81df0fe..476e27f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -18,5 +18,5 @@
     "conflicts": [
         "Jen"
     ],
-    "version": "1.8.3"
+    "version": "1.8.4"
 }
\ No newline at end of file
diff --git a/src/joker.lua b/src/joker.lua
index b57c27f..0a6b8e3 100644
--- a/src/joker.lua
+++ b/src/joker.lua
@@ -168,7 +168,7 @@ local esc = SMODS.Joker {
             "{C:inactive,s:0.75,E:1}#5#{C:red,s:1.5,E:1}#6#",
         },
     },
-    config = {extra = {money = 2, xmoney = 2, max = 200}},
+    config = {extra = {money = 2, xmoney = 2, max = 200, escape_label = "ESCAPE"}},
     attributes = {"destroy_card", "economy", "tag"},
     pos = {x = 0, y = 0},
     sinis = {x = 2, y = 0},
@@ -189,6 +189,12 @@ local esc = SMODS.Joker {
 
         return {vars = {extra.xmoney, number_format(extra.max), extra.money, normal[1], normal[2], scared}}
     end,
+    calculate = function(_, card)
+        local extra = card.ability.extra
+        local label = extra.escape_label
+        extra.escape_label = escapey_button_text(card)
+        local _ = label ~= extra.escape_label and Bakery_API.rehighlight(card)
+    end,
     Bakery_can_use = function(_, card)
         if not Jane.can_use() or card.debuff then
             return false
@@ -207,11 +213,7 @@ local esc = SMODS.Joker {
         return false
     end,
     Bakery_use_button_text = function(_, card)
-        local extra = card.ability.extra
-        local label = extra.escape_label
-        extra.escape_label = escapey_button_text(card)
-        local _ = label ~= extra.escape_label and Bakery_API.rehighlight(card)
-        return extra.escape_label
+        return card.ability.extra.escape_label
     end,
     Bakery_use_joker = function(self, card)
         if card.debuff then