diff --git a/MVMCoreUI/Containers/views/EntryFieldContainer.swift b/MVMCoreUI/Containers/views/EntryFieldContainer.swift
index 3f80006a..96a51a8f 100644
--- a/MVMCoreUI/Containers/views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/views/EntryFieldContainer.swift
@@ -118,7 +118,7 @@ import UIKit
     //--------------------------------------------------
     
     /// Holds reference to delegateObject to inform molecular tableView of an update.
-    var delegateObject: MVMCoreUIDelegateObject?
+    weak var delegateObject: MVMCoreUIDelegateObject?
     
     //--------------------------------------------------
     // MARK: - Lifecycle
@@ -271,17 +271,9 @@ import UIKit
             layoutIfNeeded()
         }
     }
-    
-    //--------------------------------------------------
-    // MARK: - MVMCoreUIMoleculeViewProtocol
-    //--------------------------------------------------
-    
-    open override func setWithModel(_ model: MoleculeModelProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        super.setWithModel(model, delegateObject, additionalData)
-        self.delegateObject = delegateObject
-    }
 }
 
+// MARK:- MVMCoreUIMoleculeViewProtocol
 extension EntryFieldContainer {
     
     override open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {