Reverted back to using NumberFormat, Apache NumberUtils didn't work