Bugfix Scheduler