@@ -437,14 +437,12 @@
 	addrIn6->sin6_port = OF_BSWAP16_IF_LE(port);
 
 	doubleColon = [IPv6 rangeOfString: @"::"].location;
 
 	if (doubleColon != OF_NOT_FOUND) {
-		OFString *left = [IPv6 substringWithRange:
-		    of_range(0, doubleColon)];
-		OFString *right = [IPv6 substringWithRange:
-		    of_range(doubleColon + 2, IPv6.length - doubleColon - 2)];
+		OFString *left = [IPv6 substringToIndex: doubleColon];
+		OFString *right = [IPv6 substringFromIndex: doubleColon + 2];
 		OFArray OF_GENERIC(OFString *) *leftComponents;
 		OFArray OF_GENERIC(OFString *) *rightComponents;
 		size_t i;
 
 		if ([right hasPrefix: @":"] || [right containsString: @"::"])