Re-implement stop()