NiceNumber fixes