Invoices fix