added support for values with commas