Fixed bug after rebase