Minor fix from the merge