improved performance on stop()