Parsing bug fixed