fix for stop()