Fixes using 6.x scheduler class instead of old 4.x one