Scheduling fix