Fixed parsing of data with commas in it