Additional fix to the merge.