Fix rebase bug