Merge pull request #6999 from boohoogal/master

Fixed parse error #6998