Fix sheduling