Fixed rebase