diff --git a/motor.c b/motor.c
index f7225466..8f9c58c1 100644
--- a/motor.c
+++ b/motor.c
@@ -565,40 +565,31 @@ extern void KillPiPiezo(void *pData);
       *fVal = self->pDriver->fLower;
       return 1;
     }
+    if(strcmp(name,"position") == 0)
+    {
+      *fVal = self->fPosition;
+      return 1;
+    }
+    else if(strcmp(name,"target") == 0)
+    {
+      *fVal = self->fTarget;
+      return 1;
+    }
 
     pPar = ObParFind(self->ParArray,name);
     if(pPar)
     {
       *fVal = pPar->fVal;
       return 1;
-    }
-    else
-    {
-       /* can still be position */
-       if(strcmp(name,"position") == 0)
-       {
-         *fVal = self->fPosition;
-         return 1;
-       }
-       else if(strcmp(name,"target") == 0)
-       {
-	 *fVal = self->fTarget;
-         return 1;
-       }
-       else
-       {
-         /*
-           check for a driver parameter
-	 */
-	 if(self->pDriver->GetDriverPar != NULL)
-	 {
-	   return self->pDriver->GetDriverPar(self->pDriver,name,fVal); 
-         } 
-         else
-	 {
-	   return 0;
-         } 
-       }
+    } else {
+      if(self->pDriver->GetDriverPar != NULL)
+      {
+	return self->pDriver->GetDriverPar(self->pDriver,name,fVal); 
+      } 
+      else
+      {
+	return 0;
+      } 
     } 
   }
 /*---------------------------------------------------------------------------*/