[Parser] Resolved #172 - Works for me