Bugfix for scheduler ?