diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 7e1141ba..fac7a60e 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -16,6 +16,7 @@ import UIKit
     /// Set if this page is containted in a manager.
     public var manager: (UIViewController & MVMCoreViewManagerProtocol)?
     
+    // TODO: Change this logic once we convert the MVMCoreViewControllerProtocol to swift
     public var selfDelegateObject: MVMCoreUIDelegateObject?
     public func delegateObject() -> DelegateObject? {
         if selfDelegateObject == nil {