PROBLEM WITH AGGREGATION AND INVOICING IN 17.1