diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 77cf47f5..fc9ba1c2 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -102,7 +102,6 @@ class LegoOmni : public MxOmni {
 
 	LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
 	LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }
-
 	LegoInputManager* GetInputManager() { return m_inputMgr; }
 	GifManager* GetGifManager() { return m_gifManager; }
 	LegoWorld* GetCurrentOmniWorld() { return m_currentWorld; }
@@ -116,6 +115,8 @@ class LegoOmni : public MxOmni {
 	MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
 	MxDSAction& GetCurrentAction() { return m_action; }
 
+	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
+
 	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
 
 private:
diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
index 4ea4d428..a2e1bb04 100644
--- a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp
@@ -94,8 +94,9 @@ MxResult LegoPointOfViewController::Create(Lego3DView* p_lego3DView)
 {
 	m_lego3DView = p_lego3DView;
 	m_nav = new LegoNavController();
+	LegoOmni::GetInstance()->SetNavController(m_nav);
 	m_nav->SetTrackDefaultParams(TRUE);
-	LegoOmni::GetInstance()->GetTickleManager()->RegisterClient(this, 10);
+	TickleManager()->RegisterClient(this, 10);
 	return SUCCESS;
 }