diff --git a/src/pStateManagement/StateManagement.cpp b/src/pStateManagement/StateManagement.cpp
index b503f49..4a49619 100755
--- a/src/pStateManagement/StateManagement.cpp
+++ b/src/pStateManagement/StateManagement.cpp
@@ -49,7 +49,6 @@ bool StateManagement::OnNewMail(MOOSMSG_LIST &NewMail)
     Json::Value deviceState;
     std::string manualState;
     int missionState;
-    int missionState;
 
     if(key == "uManual_enable_cmd")
     {
@@ -78,16 +77,15 @@ bool StateManagement::OnNewMail(MOOSMSG_LIST &NewMail)
     {
       if(missionState == 0)
       {
-      case 0:
         deviceState["opMode"] = opModeLists.error;
-        break;
-      case 1:
+      }
+      if(missionState == 1)
+      {
         deviceState["opMode"] = opModeLists.service;
       }
       if((missionState == 3) )
       {
         deviceState["opMode"] = opModeLists.maneuver;
-        break;
       }
     }