Parsing bug fix