Fix rebase mistake