diff --git a/source/Motor.m b/source/Motor.m
index e376fca5a5a8a862215924ffe62e86a349a6a448..be281aea8eca1d04a9721ba351967cd30e36312d 100755
--- a/source/Motor.m
+++ b/source/Motor.m
@@ -1186,7 +1186,7 @@ classdef Motor < MaskedHandle & dynamicprops
             motor.resetTachoCount();
             motor.internalReset();
             motor.setBrake(0);
-            motor.stop();
+            %motor.stop();
         end
     end
 end
diff --git a/source/Sensor.m b/source/Sensor.m
index 27316b0fe1fb61c4c73e4981b60a4c1ae456b039..d275d507371c37bb35570b7031a8641fef6a9e44 100755
--- a/source/Sensor.m
+++ b/source/Sensor.m
@@ -364,6 +364,7 @@ classdef Sensor < MaskedHandle
             end
             
             sensor.mode = DeviceMode(sensor.type, uint8(0));
+            sensor.reset;
         end
     end
 end