Fix to InvoiceVariable fields