Minor fix in last merge