diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index ec52c99c375ddde2c930bd1166e8b0630ac2f863..05d6341b50b9d6e91793418df7b21d2c6cc9e5d4 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -109,7 +109,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[]) :
     bool fClearSettingsOptions = false; // Clear stored settings
     
     CmdLineOpt_t rgCmdLineOptions[] = {
-        { "--clear-settings",   &fClearSettingsOptions },
+        { "--clear-settings",   &fClearSettingsOptions, QString() },
         // Add additional command line option flags here
     };
     
@@ -136,13 +136,15 @@ QGCApplication::~QGCApplication()
 
 void QGCApplication::_initCommon(void)
 {
-    _createSingletons();
+
 }
 
 bool QGCApplication::_initForNormalAppBoot(void)
 {
     QSettings settings;
     
+    _createSingletons();
+    
     // Exit main application when last window is closed
     connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit()));