small rebase improvement