Rebase fix