Fix parsing bug