[Parser] Fixed #87, fixed #55