Fix for Simplified Invoices