Correct rebase in a hurry