Fixed rebase bug