diff --git a/SHADE_Engine/src/Tools/Utilities/SHStringUtilities.cpp b/SHADE_Engine/src/Tools/Utilities/SHStringUtilities.cpp
index b1e4aa92..b9698071 100644
--- a/SHADE_Engine/src/Tools/Utilities/SHStringUtilities.cpp
+++ b/SHADE_Engine/src/Tools/Utilities/SHStringUtilities.cpp
@@ -26,27 +26,29 @@ namespace SHADE
     std::vector<std::wstring> SHStringUtilities::Split(const std::wstring& str, const wchar_t& delim)
     {
         return Split<wchar_t>(str, delim);
-	}
-	std::string SHStringUtilities::WstrToStr(const std::wstring& wstr)
-	{
-		static std::vector<char> buffer;
-		const int STR_SIZE = WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.size()), nullptr, 0, nullptr, nullptr) + 1 /* Null Terminator */;
-		buffer.resize(STR_SIZE);
-		WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.size()), buffer.data(), MAX_PATH, nullptr, nullptr);
-		return std::string(buffer.data());
-	}
-	std::wstring SHStringUtilities::StrToWstr(const std::string& str)
-	{
-		static std::vector<wchar_t> buffer;
-		const int WSTR_SIZE = MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), nullptr, 0) + 1 /* Null Terminator */;
-		buffer.resize(WSTR_SIZE);
-		MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), buffer.data(), WSTR_SIZE);
-		return std::wstring(buffer.data());
-	}
+  }
+  std::string SHStringUtilities::WstrToStr(const std::wstring& wstr)
+  {
+    static std::vector<char> buffer;
+    buffer.clear();
+    const int STR_SIZE = WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.size()), nullptr, 0, nullptr, nullptr) + 1 /* Null Terminator */;
+    buffer.resize(STR_SIZE, '\0');
+    WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.size()), buffer.data(), MAX_PATH, nullptr, nullptr);
+    return std::string(buffer.data());
+  }
+  std::wstring SHStringUtilities::StrToWstr(const std::string& str)
+  {
+    static std::vector<wchar_t> buffer;
+    buffer.clear();
+    const int WSTR_SIZE = MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), nullptr, 0) + 1 /* Null Terminator */;
+    buffer.resize(WSTR_SIZE, '\0');
+    MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.size()), buffer.data(), WSTR_SIZE);
+    return std::wstring(buffer.data());
+  }
 
-	std::string SHStringUtilities::GetWin32ErrorMessage(unsigned long errorCode)
-	{
-		return std::system_category().message(errorCode);
-	}
+  std::string SHStringUtilities::GetWin32ErrorMessage(unsigned long errorCode)
+  {
+    return std::system_category().message(errorCode);
+  }
     
 } 
\ No newline at end of file