Fixed comma issuse