Issue #8 invoices broken