Fix error in recent rebase