Defect 1977 fixed