Scheduler important fix