Fix to a merging error.