Merge change 7927

* changes:
  Fixed a bug in the parser.