Fixed (a little clunkily) the use case where commas are inside quotes