Fix issue with rebase