--- a/Applications/Generic/NativeStoneApplicationContext.h	Thu Nov 15 17:28:15 2018 +0100
+++ b/Applications/Generic/NativeStoneApplicationContext.h	Thu Nov 15 18:32:48 2018 +0100
@@ -37,7 +37,6 @@
     static void UpdateThread(NativeStoneApplicationContext* that);
 
     boost::mutex    globalMutex_;
-    MessageBroker&  broker_;
     WidgetViewport  centralViewport_;
     boost::thread   updateThread_;
     bool            stopped_;
@@ -59,11 +58,6 @@
 
       IWidget& SetCentralWidget(IWidget* widget);   // Takes ownership
 
-      MessageBroker& GetMessageBroker() const
-      {
-        return that_.broker_;
-      }
-    
       IViewport& GetCentralViewport() 
       {
         return that_.centralViewport_;
@@ -73,6 +67,11 @@
       {
         that_.updateDelayInMs_ = delayInMs;
       }
+
+      MessageBroker& GetMessageBroker()
+      {
+        return that_.GetMessageBroker();
+      }
     };
 
     NativeStoneApplicationContext(MessageBroker& broker);