Fix after the merge.