Fixed the parser's problem.
Merge branch 'fix_parser_problem'