Scheduler: Fixes #46