Scheduler fix