Fixed comma split bug