scheduler: better stop handling