Removing bug generated in the merge.