Remove -> Stop, fixed #6