Hotfix for scheduller