Invoice Billing fix