Fixed the problem caused by rebase