Fixed a issue on merge.