Fixed the motor control class