diff --git a/MagazineLayout/Public/MagazineLayout.swift b/MagazineLayout/Public/MagazineLayout.swift
index 4842215..2e30076 100755
--- a/MagazineLayout/Public/MagazineLayout.swift
+++ b/MagazineLayout/Public/MagazineLayout.swift
@@ -102,6 +102,19 @@ public final class MagazineLayout: UICollectionViewLayout {
       prepareActions.contains(.recreateSectionModels)
     {
       hasPinnedHeaderOrFooter = false
+      lastSizedElementMinY = nil
+      lastSizedElementPreferredHeight = nil
+    }
+
+    // Recreate section models from scratch if necessary
+    if prepareActions.contains(.recreateSectionModels) {
+      var sections = [SectionModel]()
+      for sectionIndex in 0..<currentCollectionView.numberOfSections {
+        let sectionModel = sectionModelForSection(atIndex: sectionIndex)
+        sections.append(sectionModel)
+      }
+
+      modelState.setSections(sections)
     }
 
     // Update layout metrics if necessary
@@ -136,25 +149,6 @@ public final class MagazineLayout: UICollectionViewLayout {
       }
     }
 
-    // Recreate section models from scratch if necessary
-    if prepareActions.contains(.recreateSectionModels) {
-      var sections = [SectionModel]()
-      for sectionIndex in 0..<currentCollectionView.numberOfSections {
-        let sectionModel = sectionModelForSection(atIndex: sectionIndex)
-        sections.append(sectionModel)
-      }
-
-      modelState.setSections(sections)
-    }
-
-    if
-      prepareActions.contains(.recreateSectionModels) ||
-      prepareActions.contains(.updateLayoutMetrics)
-    {
-      lastSizedElementMinY = nil
-      lastSizedElementPreferredHeight = nil
-    }
-
     prepareActions = []
   }