Fix previous rebase