diff --git a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
index 56b1a86c..04280042 100644
--- a/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/TemplateProtocol.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-
 public protocol TemplateProtocol: AnyObject {
     associatedtype TemplateModel: TemplateModelProtocol
     var templateModel: TemplateModel? { get set }
@@ -19,6 +18,7 @@ public extension TemplateProtocol where Self: ViewController {
         guard let pageJSON = json else { return }
         let data = try JSONSerialization.data(withJSONObject: pageJSON)
         let decoder = JSONDecoder()
+        try decoder.add(delegateObject: delegateObjectIVar)
         let templateModel = try decoder.decode(TemplateModel.self, from: data)
         self.templateModel = templateModel
         self.pageModel = templateModel as? MVMControllerModelProtocol
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 315a0476..0872b0e6 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -17,7 +17,10 @@ import UIKit
     public var manager: (UIViewController & MVMCoreViewManagerProtocol)?
     
     /// A temporary iVar backer for delegateObject() until we change the protocol
-    public var delegateObjectIVar: MVMCoreUIDelegateObject?
+    public let delegateObjectIVar: MVMCoreUIDelegateObject = {
+        return MVMCoreUIDelegateObject.create(withDelegateForAll: self)
+    }()
+    
     public func delegateObject() -> DelegateObject? {
         return delegateObjectIVar
     }
@@ -264,9 +267,6 @@ import UIKit
         // Presents from the bottom.
         modalPresentationStyle = MVMCoreGetterUtility.isOnIPad() ? .formSheet : .overCurrentContext
         
-        // Create the default delegate object.
-        delegateObjectIVar = MVMCoreUIDelegateObject.create(withDelegateForAll: self)
-        
         // Do some initial loading.
         if !initialLoadFinished {
             initialLoadFinished = true