Fixing a bad merging.