[Parser] Resolved #160