@@ -490,12 +490,12 @@
 				if (portString.length == 0 ||
 				    portString.unsignedLongLongValue > 65535)
 					@throw [OFInvalidFormatException
 					    exception];
 
-				_port = [[OFNumber alloc] initWithUInt16:
-				    (uint16_t)portString.unsignedLongLongValue];
+				_port = [[OFNumber alloc] initWithUnsignedShort:
+				    portString.unsignedLongLongValue];
 			} else if (*UTF8String != '\0')
 				@throw [OFInvalidFormatException exception];
 
 			isIPv6Host = true;
 		} else if ((tmp2 = strchr(UTF8String, ':')) != NULL) {
@@ -510,12 +510,12 @@
 			portString = [OFString stringWithUTF8String: tmp2];
 
 			if (portString.unsignedLongLongValue > 65535)
 				@throw [OFInvalidFormatException exception];
 
-			_port = [[OFNumber alloc] initWithUInt16:
-			    (uint16_t)portString.unsignedLongLongValue];
+			_port = [[OFNumber alloc] initWithUnsignedShort:
+			    portString.unsignedLongLongValue];
 		} else
 			_URLEncodedHost = [[OFString alloc]
 			    initWithUTF8String: UTF8String];
 
 		if (!isIPv6Host)