Fixed stop()