fix the bug happened during merging.