fix an error introduced during rebase