Fix issue #219 - make the scheduler work