parsing bug fix