Avoid superfluous calls to NotifyOnStop