Fixed syntax error after rebase onto master