Minor fix after rebase