Fixed issue with the stop method