fix to the new parser.