Fix parsing with comma