diff --git a/Jupiter/Readable_String_Imp.h b/Jupiter/Readable_String_Imp.h
index 8851ac0..d837adc 100644
--- a/Jupiter/Readable_String_Imp.h
+++ b/Jupiter/Readable_String_Imp.h
@@ -713,11 +713,11 @@ template<typename T> bool Jupiter::Readable_String<T>::matchi(const T *format) c
 template<typename T> unsigned int Jupiter::Readable_String<T>::wordCount(const T *whitespace) const
 {
 	unsigned int result = 0;
-	const T *p = this->ptr();
+	size_t i = 0;
 	bool prev = true;
-	while (*p != 0)
+	while (i != this->size())
 	{
-		if (Jupiter::strpbrk<T>(whitespace, *p) == nullptr) // This isn't whitespace!
+		if (Jupiter::strpbrk<T>(whitespace, this->get(i)) == nullptr) // This isn't whitespace!
 		{
 			if (prev == true) // We just left whitespace!
 			{
@@ -726,7 +726,7 @@ template<typename T> unsigned int Jupiter::Readable_String<T>::wordCount(const T
 			}
 		}
 		else prev = true; // This is whitespace!
-		p++;
+		i++;
 	}
 	return result;
 }
diff --git a/Release/Jupiter.lib b/Release/Jupiter.lib
index f3a52e7..d3cdcbe 100644
Binary files a/Release/Jupiter.lib and b/Release/Jupiter.lib differ