fix to Scheduler