fix missing properties after the merge