Improve detection if we're stopping by ourselves.