Scheduler fix for operations