scheduler hotfix