Fix a bug that prevent the merging.