syntax error fix
Merge pull request #1044
Merge pull request #1044 in master