diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
index 7c6f9ef6..4f4801c6 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift
@@ -206,15 +206,14 @@ open class ButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWat
         title = try typeContainer.decode(String.self, forKey: .title)
         action = try typeContainer.decodeModel(codingKey: .action)
         
-        if let style = decoder.context?.value(forKey: CodingKeys.style.stringValue) as? Styler.Button.Style{
+        ///Style captured from the JSON
+        if let style = try typeContainer.decodeIfPresent(Styler.Button.Style.self, forKey: .style){
             self.style = style
             setFacade(by: style)
-        }
-        
-        if let style = try typeContainer.decodeIfPresent(Styler.Button.Style.self, forKey: .style) {
+        } else  if let style = decoder.context?.value(forKey: CodingKeys.style.stringValue) as? Styler.Button.Style { ///Reading the style param from context which is set is molecules, ex: TwoButtonView
             self.style = style
             setFacade(by: style)
-        } else {
+        } else { ///Default style
             setFacade(by: .primary)
         }