Fixed merged issue with duplicated source code.