diff --git a/manifest.json b/manifest.json
index b392f48..b1b878b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "id": "Roland",
     "name": "Roland",
     "prefix": "Roland",
-    "version": "2.8.23",
+    "version": "2.8.24",
     "badge_colour": "8BE9FD",
     "display_name": "Roland",
     "main_file": "src/main.lua",
diff --git a/src/edition.lua b/src/edition.lua
index e0c51b1..325caac 100644
--- a/src/edition.lua
+++ b/src/edition.lua
@@ -221,7 +221,7 @@ q(function()
     local orig_calculate = estate.calculate
 
     function estate:calculate(card, context, ...)
-        if not ((card or {}).edition or {}).Roland_frozen then
+        if not (card or {}).Roland_frozen or not (card.edition or {}).Roland_frozen then
             return orig_calculate(self, card, context, ...)
         end
 
@@ -237,7 +237,7 @@ q(function()
     local orig_loc_vars = estate.loc_vars
 
     function estate:loc_vars(info_queue, card, ...)
-        if not ((card or {}).edition or {}).Roland_frozen then
+        if not (card or {}).Roland_frozen or not (card.edition or {}).Roland_frozen then
             return orig_loc_vars(self, info_queue, card, ...)
         end