Fixed the parser's bug.
Merge branch 'fix_parser'