Fixing a merge bug.