Fixed parsing with comma