Fix a rebase bug