Fixing reschedule from-scratch