diff --git a/MVMCoreUI/Atoms/Views/Checkbox.swift b/MVMCoreUI/Atoms/Views/Checkbox.swift
index 07628416..af039435 100644
--- a/MVMCoreUI/Atoms/Views/Checkbox.swift
+++ b/MVMCoreUI/Atoms/Views/Checkbox.swift
@@ -478,11 +478,11 @@ import MVMCore
         }
         
         if let borderColor = checkboxModel.borderColor {
-            layer.borderColor = borderColor.cgColor
+            self.borderColor = borderColor.uiColor
         }
         
         if let borderWidth = checkboxModel.borderWidth {
-            layer.borderWidth = borderWidth
+            self.borderWidth = borderWidth
         }
         
         if checkboxModel.isChecked {
diff --git a/MVMCoreUI/Atoms/Views/CheckboxModel.swift b/MVMCoreUI/Atoms/Views/CheckboxModel.swift
index 6bf9ae1a..9be83e91 100644
--- a/MVMCoreUI/Atoms/Views/CheckboxModel.swift
+++ b/MVMCoreUI/Atoms/Views/CheckboxModel.swift
@@ -71,7 +71,7 @@ import Foundation
         try container.encodeIfPresent(required, forKey: .required)
         try container.encodeIfPresent(borderColor, forKey: .borderColor)
         try container.encodeIfPresent(borderColor, forKey: .borderColor)
-        try container.encodeIfPresent(isChecked, forKey: .isChecked)
+        try container.encode(isChecked, forKey: .isChecked)
         try container.encodeIfPresent(checkColor, forKey: .checkColor)
         try container.encodeIfPresent(unCheckedBackgroundColor, forKey: .unCheckedBackgroundColor)
         try container.encodeIfPresent(checkedBackgroundColor, forKey: .checkedBackgroundColor)