scheduler: try to improve unschedule behavior