Fix, scheduler is optional