Fixed syntax error after rebase