diff --git a/sinqEPICSApp/src/pmacAxis.cpp b/sinqEPICSApp/src/pmacAxis.cpp
index 4c9de42..f5b2892 100644
--- a/sinqEPICSApp/src/pmacAxis.cpp
+++ b/sinqEPICSApp/src/pmacAxis.cpp
@@ -925,8 +925,8 @@ asynStatus pmacV3Axis::poll(bool *moving) {
   }
 
   callParamCallbacks();
+  return status;
 
-  return status ? asynError : asynSuccess;
 }
 
 
@@ -986,9 +986,7 @@ asynStatus pmacV3Axis::getAxisStatus(bool *moving) {
   previous_position_ = position;
   previous_direction_ = direction;
 
-  /* are we done? */
-  /* if ((axStat == 0 || axStat < 0) && starting == 0) { */
-  if (axStat == 0 && starting == 0) {
+  if (axStat <= 0 && starting == 0) {
     done = 1;
   } else {
     starting = 0;
@@ -1754,4 +1752,4 @@ asynStatus GirderAxis::poll(bool *moving) {
   status = status > st ? status : st;
 
   return status;
-}
\ No newline at end of file
+}