Fix bug in long stopping