fixed a bug that happened during merging