diff --git a/Jupiter/Readable_String_Imp.h b/Jupiter/Readable_String_Imp.h
index d837adc..f13669b 100644
--- a/Jupiter/Readable_String_Imp.h
+++ b/Jupiter/Readable_String_Imp.h
@@ -65,6 +65,9 @@ template<typename T> size_t Jupiter::Readable_String<T>::find(const T &value, si
 template<typename T> size_t Jupiter::Readable_String<T>::find(const Jupiter::Readable_String<T> &in) const
 {
 	if (in.size() > this->size()) return Jupiter::INVALID_INDEX;
+	if (in.size() == this->size()) return this->equals(in) ? 0 : Jupiter::INVALID_INDEX;
+	if (in.size() == 0) return 0;
+
 	size_t j;
 	for (size_t i = 0; i != this->size() - in.size() + 1; i++)
 	{
diff --git a/Release/Jupiter.lib b/Release/Jupiter.lib
index d3cdcbe..8959ca6 100644
Binary files a/Release/Jupiter.lib and b/Release/Jupiter.lib differ