Fixed Data Parsing
commit