fix merging introduced defect