diff --git a/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift b/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift
index d8812119..0bbcd45f 100644
--- a/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/CollectionTemplate.swift
@@ -79,9 +79,9 @@ import Foundation
     
     
     open override func handleNewData() {
-        super.handleNewData()
         setup()
-        registerCells()
+        registerCells()        
+        super.handleNewData()
     }
 
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
index 7575faf1..b236e332 100644
--- a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
@@ -81,9 +81,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     }
     
     open override func handleNewData() {
-        super.handleNewData()
         setup()
         registerWithTable()
+        super.handleNewData()
     }
     
     //--------------------------------------------------