diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift
index b608ba41..5ca1eae1 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2PricingTwoRowsModel.swift
@@ -21,23 +21,6 @@ public class HeadersH2PricingTwoRowsModel: HeaderModel, MoleculeModelProtocol {
     public var body3: LabelModel
     public var subBody3: LabelModel?
     
-    //-----------------------------------------------------
-    // MARK: - Methods
-    //-----------------------------------------------------
-    
-    override public func setDefaults() {
-        super.setDefaults()
-        if body.numberOfLines == nil {
-            body.numberOfLines = 1
-        }
-        if body2.numberOfLines == nil {
-            body2.numberOfLines = 1
-        }
-        if body3.numberOfLines == nil {
-            body3.numberOfLines = 1
-        }
-    }
-    
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
@@ -66,6 +49,15 @@ public class HeadersH2PricingTwoRowsModel: HeaderModel, MoleculeModelProtocol {
         subBody?.attributes = [LabelAttributeStrikeThroughModel(0, subBody?.text.count ?? 0)]
         subBody2?.attributes = [LabelAttributeStrikeThroughModel(0, subBody2?.text.count ?? 0)]
         subBody3?.attributes = [LabelAttributeStrikeThroughModel(0, subBody3?.text.count ?? 0)]
+        if body.numberOfLines == nil {
+            body.numberOfLines = 1
+        }
+        if body2.numberOfLines == nil {
+            body2.numberOfLines = 1
+        }
+        if body3.numberOfLines == nil {
+            body3.numberOfLines = 1
+        }
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift
index d690d681..44c4ef90 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Miscellaneous/ListStoreLocatorModel.swift
@@ -18,17 +18,6 @@ public class ListStoreLocatorModel: ListItemModel, MoleculeModelProtocol {
     public var leftSubBody: LabelModel
     public var rightLabel: LabelModel
     
-    //-----------------------------------------------------
-    // MARK: - Methods
-    //-----------------------------------------------------
-    
-    override public func setDefaults() {
-        super.setDefaults()
-        if rightLabel.numberOfLines == nil {
-            rightLabel.numberOfLines = 1
-        }
-    }
-    
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
@@ -49,6 +38,9 @@ public class ListStoreLocatorModel: ListItemModel, MoleculeModelProtocol {
     override public func setDefaults() {
         super.setDefaults()
         leftHeadline.hero = 0
+        if rightLabel.numberOfLines == nil {
+            rightLabel.numberOfLines = 1
+        }
     }
     
     //--------------------------------------------------