diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h
index c2399ad1768..d5394b4a310 100644
--- a/Objects/stringlib/find.h
+++ b/Objects/stringlib/find.h
@@ -9,29 +9,38 @@
 
 Py_LOCAL(Py_ssize_t)
 stringlib_find(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
-               const STRINGLIB_CHAR* sub, Py_ssize_t sub_len)
+               const STRINGLIB_CHAR* sub, Py_ssize_t sub_len,
+               Py_ssize_t offset)
 {
-    if (sub_len == 0)
-        return 0;
+    Py_ssize_t pos;
 
-    return fastsearch(str, str_len, sub, sub_len, FAST_SEARCH);
+    if (sub_len == 0)
+        return offset;
+
+    pos = fastsearch(str, str_len, sub, sub_len, FAST_SEARCH);
+
+    if (pos >= 0)
+        pos += offset;
+
+    return pos;
 }
 
 Py_LOCAL(Py_ssize_t)
 stringlib_rfind(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
-                const STRINGLIB_CHAR* sub, Py_ssize_t sub_len)
+                const STRINGLIB_CHAR* sub, Py_ssize_t sub_len,
+                Py_ssize_t offset)
 {
     Py_ssize_t pos;
 
     /* XXX - create reversefastsearch helper! */
     if (sub_len == 0)
-	pos = str_len;
+	pos = str_len + offset;
     else {
 	Py_ssize_t j;
         pos = -1;
 	for (j = str_len - sub_len; j >= 0; --j)
             if (STRINGLIB_CMP(str+j, sub, sub_len) == 0) {
-                pos = j;
+                pos = j + offset;
                 break;
             }
     }
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 75325ab84a1..8d2a0be2256 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -775,6 +775,8 @@ PyString_AsStringAndSize(register PyObject *obj,
 #define STRINGLIB_EMPTY nullstring
 
 #include "stringlib/fastsearch.h"
+
+#include "stringlib/find.h"
 #include "stringlib/partition.h"
 
 /* -------------------------------------------------------------------- */
@@ -1876,25 +1878,10 @@ string_find_internal(PyStringObject *self, PyObject *args, int dir)
 
 	string_adjust_indices(&i, &last, len);
 
-	if (n == 0)
-		return (dir > 0) ? i : last;
-	if (dir > 0) {
-		Py_ssize_t pos = fastsearch(s + i, last - i, sub, n,
-					    FAST_SEARCH);
-		if (pos < 0)
-			return pos;
-		return pos + i;
-	} else {
-		Py_ssize_t j;
-
-        	if (n == 0 && i <= last)
-			return last;
-		for (j = last-n; j >= i; --j)
-			if (s[j] == sub[0] && memcmp(&s[j], sub, n) == 0)
-				return j;
-	}
-
-	return -1;
+	if (dir > 0)
+		return stringlib_find(s+i, last-i, sub, n, i);
+	else
+		return stringlib_rfind(s+i, last-i, sub, n, i);
 }
 
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2732c2ccaf1..20f943f9a40 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3967,16 +3967,15 @@ Py_ssize_t PyUnicode_Find(PyObject *str,
 
     if (direction > 0)
         result = stringlib_find(
-            str_obj->str + start, end - start, sub_obj->str, sub_obj->length
+            str_obj->str + start, end - start, sub_obj->str, sub_obj->length,
+            start
             );
     else
         result = stringlib_rfind(
-            str_obj->str + start, end - start, sub_obj->str, sub_obj->length
+            str_obj->str + start, end - start, sub_obj->str, sub_obj->length,
+            start
             );
 
-    if (result >= 0)
-        result += start;
-
     Py_DECREF(str_obj);
     Py_DECREF(sub_obj);
     return result;