Fixed rescheduling issue