Fix error caused by rebase