diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift
index f7d476ec..388f40cb 100644
--- a/MVMCoreUI/Atoms/Views/Label.swift
+++ b/MVMCoreUI/Atoms/Views/Label.swift
@@ -234,7 +234,6 @@ public typealias ActionBlock = () -> ()
             textAlignment = .left
         }
         
-        
         makeWholeViewClickable = labelModel.makeWholeViewClickable ?? false
         if let backgroundColorHex = labelModel.backgroundColor, !backgroundColorHex.isEmpty {
             backgroundColor = UIColor.mfGet(forHex: backgroundColorHex)
@@ -245,7 +244,7 @@ public typealias ActionBlock = () -> ()
         if let fontStyle = labelModel.fontStyle {
             MFStyler.styleLabel(self, withStyle: fontStyle)
         } else {
-            let fontSize = labelModel.fontSize as? CGFloat
+            let fontSize = labelModel.fontSize
             if let fontName = labelModel.fontName {
                 font = MFFonts.mfFont(withName: fontName, size: fontSize ?? font.pointSize)
             } else if let fontSize = fontSize {
@@ -313,11 +312,10 @@ public typealias ActionBlock = () -> ()
                 default:
                     continue
                 }
+            }
+            originalAttributedString = attributedText
+            hero = labelModel.hero
         }
-        
-        originalAttributedString = attributedText
-        hero = labelModel.hero
-    }
     }
     
     @objc public static func setUILabel(_ label: UILabel?, withJSON json: [AnyHashable: Any]?, delegate: DelegateObject?, additionalData: [AnyHashable: Any]?) {