- Fix parsing logic