little fix and parse