Changed to use COMMA_SEPARATOR.