fixed deadlines issue