Deadline fix 2