Fixed the code after rebase