Fix Scheduler