Minor fix due to the merge.