Fixed issue with number formatting