Number format bugfix