Defect id - 1, 2, 3 fixed