diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
index 49e242aa2..ca6e14fe6 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
@@ -1681,7 +1681,7 @@ void ConfigInputWidget::adjustSpecialNeutrals()
 bool ConfigInputWidget::shouldObjectBeSaved(UAVObject *object)
 {
     // ManualControlCommand no need to be saved
-    return dynamic_cast<ManualControlCommand *>(object) == 0;
+    return dynamic_cast<ManualControlCommand *>(object) == NULL;
 }
 
 void ConfigInputWidget::resetChannelSettings()
diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.h b/ground/openpilotgcs/src/plugins/config/configinputwidget.h
index 49e4fabc3..913d55f70 100644
--- a/ground/openpilotgcs/src/plugins/config/configinputwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.h
@@ -66,7 +66,6 @@ public:
         goToWizard();
     }
     void enableControls(bool enable);
-
     bool shouldObjectBeSaved(UAVObject *object);
 
 private: