Accounting bootstrap fix