Handle names containing coma