changed back to a simple regex that works (doesn't escape commas though)