fix error introduced by rebase