Add offset for number_format indexes

Created originally on Bitbucket by erichurkman

Was already merged in Bitbucket before import, marked as merged by the import user

This seems to fix the issue; it was adding the format offset in one code branch but not the other.