Fix issue with bad rebase