fix parse error
Merge branch 'hotfix/parse_error'