Fix rescheduling problem