New parser, fixed #399.