Extra commas bug fixed