Fixed a problem after rebase