Fix after merge.