Correct rebase