Adagio Invoices V8.0 is currently under development. We will see if we can try and change the behavior in the forthcoming release.