diff --git a/src/masterMacsAxis.cpp b/src/masterMacsAxis.cpp
index a2d9a85..0b08621 100644
--- a/src/masterMacsAxis.cpp
+++ b/src/masterMacsAxis.cpp
@@ -510,9 +510,6 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
     setAxisParamChecked(this, motorEncoderPosition, currentPosition);
 
     if (pMasterMacsA_->lastMoveCommand == velocityMode && !speedEqualZero()) {
-
-        // TODO: Not sure whether the RVEL field of the motor record does not
-        // work - has to be clarified
         double actualVelocity = 0.0;
 
         rwStatus = pC_->read(axisNo_, 14, response);
@@ -525,8 +522,10 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
                                               __PRETTY_FUNCTION__, __LINE__);
         }
 
-        // Write the actual velocity to the paramLib (TODO: does it though?)
-        setAxisParamChecked(this, motorVelocity, actualVelocity);
+        // Writes the actual speed in steps per second to the paramLib. This
+        // value is then returned by the RVEL field of the motor record.
+        setAxisParamChecked(this, motorVelocity,
+                            actualVelocity / motorRecResolution);
 
         // Motor is moving in velocity mode
         *moving = true;