Fixed Reschedule id problem