Scheduler fixed