diff --git a/MVMCoreUI/Atoms/Views/Checkbox.swift b/MVMCoreUI/Atoms/Views/Checkbox.swift
index 0c7ca537..ae9b3354 100644
--- a/MVMCoreUI/Atoms/Views/Checkbox.swift
+++ b/MVMCoreUI/Atoms/Views/Checkbox.swift
@@ -515,12 +515,11 @@ import MVMCore
             isEnabled(enabled)
         }
         
-        guard let action = checkboxModel.action else { return }
-        actionBlock = {
-            if let data = try? action.encode(using: JSONEncoder()),
-                let actionMap = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.init()) as? [AnyHashable: Any] {
-                MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
-                
+        if let action = checkboxModel.action {
+            actionBlock = {
+                if let actionMap = action.toJSON() {
+                    MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
+                }
             }
         }
     }