maybe a fix for the stop method