Fixing rescheduling