Improved stop command