Fix for reschedule