@@ -1396,16 +1396,14 @@
 			return YES;
 
 	return NO;
 }
 
-- (OFString*)substringFromIndex: (size_t)start
-			toIndex: (size_t)end
+- (OFString*)substringWithRange: (of_range_t)range
 {
-	if (start > end)
-		@throw [OFInvalidArgumentException newWithClass: isa
-						       selector: _cmd];
+	size_t start = range.start;
+	size_t end = range.start + range.length;
 
 	if (end > s->length)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 	if (s->isUTF8) {
@@ -1417,16 +1415,10 @@
 
 	return [OFString stringWithCString: s->cString + start
 				    length: end - start];
 }
 
-- (OFString*)substringWithRange: (of_range_t)range
-{
-	return [self substringFromIndex: range.start
-				toIndex: range.start + range.length];
-}
-
 - (OFString*)stringByAppendingString: (OFString*)string
 {
 	OFMutableString *new;
 
 	new = [OFMutableString stringWithString: self];