Scheduler: Fixes #34