fixed mistake when merging changes