parsing bug fixed