#205: scheduler termination improved