fix for multiple calls to stop