diff --git a/source/Motor.m b/source/Motor.m
index bc4abd68bf303196c4cd724c31115ad1721ca59d..fc0de1b582036feaef07b9513063ec0556347dc9 100755
--- a/source/Motor.m
+++ b/source/Motor.m
@@ -699,9 +699,9 @@ classdef Motor < MaskedHandle & dynamicprops
         function set.speedRegulation(motor, speedRegulation)
             if ~isBool(speedRegulation)
                 error('Motor::set.speedRegulation: Given parameter is not a bool.');
-%             elseif motor.connectedToBrick && motor.physicalMotorConnected
+%             elseif motor.connectedToBrick && motor.physicalMotorConnected && ~motor.speedRegulation && speedRegulation 
 %                 pause(0.5);
-%                 if motor.currentSpeed ~= 0
+%                 if motor.isRunning 
 %                     error(['Motor::set.speedRegulation: Cannot change speed regulation while ', ...
 %                         'is motor is moving.']);
 %                 end