defect 37 was fixed here