@@ -1181,11 +1181,11 @@
 
 	if ((searchLength = [string length]) == 0)
 		return of_range(0, 0);
 
 	if (searchLength > range.length)
-		return of_range(OF_INVALID_INDEX, 0);
+		return of_range(OF_NOT_FOUND, 0);
 
 	if (range.length > SIZE_MAX / sizeof(of_unichar_t))
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
 	pool = objc_autoreleasePoolPush();
@@ -1229,11 +1229,11 @@
 		free(unicodeString);
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	return of_range(OF_INVALID_INDEX, 0);
+	return of_range(OF_NOT_FOUND, 0);
 }
 
 - (BOOL)containsString: (OFString*)string
 {
 	void *pool;