fix defect 149 from github again again