diff --git a/site_ansto/instrument/TEST_SICS/fakeGalil/galilmotor.py b/site_ansto/instrument/TEST_SICS/fakeGalil/galilmotor.py
index ce5f8c41..c6fb73f9 100644
--- a/site_ansto/instrument/TEST_SICS/fakeGalil/galilmotor.py
+++ b/site_ansto/instrument/TEST_SICS/fakeGalil/galilmotor.py
@@ -236,6 +236,8 @@ class GalilMotor(object):
             self.accel = max(1, abs(int(arg)))
         elif cmd == "DC":
             self.decel = max(1, abs(int(arg)))
+        elif cmd == "DP":
+            self.currentSteps = int(arg)
         else:
             print "Unknown assignment", cmd, arg
 
diff --git a/site_ansto/motor_dmc2280.c b/site_ansto/motor_dmc2280.c
index 7209021e..c6a4ee71 100644
--- a/site_ansto/motor_dmc2280.c
+++ b/site_ansto/motor_dmc2280.c
@@ -2648,6 +2648,7 @@ static void DMCState_MotorStart(pDMC2280Driv self, pEvtEvent event) {
           cmdStatus(self);
           self->status_valid = false;
           self->subState = 4;
+          return;
         }
         else if (self->subState == 4) { /* Status after Zero */
           int iRet;
@@ -2660,6 +2661,7 @@ static void DMCState_MotorStart(pDMC2280Driv self, pEvtEvent event) {
           set_lastMotion(self, self->currSteps, self->currCounts);
           cmdOn(self);
           self->subState = 1;
+          return;
         }
       } while (0);
       break;