fixed number formatting bug
Merge branch 'hotfix/number-format-bug'