Scheduler Bugfix