diff --git a/sourcehook/sh_tinyhash.h b/sourcehook/sh_tinyhash.h
index 52b6e85..a7ddddd 100644
--- a/sourcehook/sh_tinyhash.h
+++ b/sourcehook/sh_tinyhash.h
@@ -63,17 +63,11 @@ namespace SourceHook
 
 		~THash()
 		{
-			if (m_Buckets)
-				delete [] m_Buckets;
+			_Clear();
 		}
 		void clear()
 		{
-			if (m_Buckets)
-				delete [] m_Buckets;
-			m_Buckets = NULL;
-			m_numBuckets = 0;
-			m_percentUsed = 0.0f;
-			
+			_Clear();
 			_Refactor();
 		}
 		size_t GetBuckets()
@@ -90,6 +84,21 @@ namespace SourceHook
 			return pNode->val;
 		}
 	private:
+		void _Clear()
+		{
+			for (size_t i=0; i<m_numBuckets; i++)
+			{
+				if (m_Buckets[i])
+				{
+					delete m_Buckets[i];
+					m_Buckets[i] = NULL;
+				}
+			}
+			if (m_Buckets)
+				delete [] m_Buckets;
+			m_Buckets = NULL;
+			m_numBuckets = 0;
+		}
 		THashNode *_FindOrInsert(const K & key)
 		{
 			size_t place = HashFunction(key) % m_numBuckets;
diff --git a/sourcehook/test/test.vcproj b/sourcehook/test/test.vcproj
index 3ca9071..0722fcc 100644
--- a/sourcehook/test/test.vcproj
+++ b/sourcehook/test/test.vcproj
@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="test"
 	ProjectGUID="{456BBA64-FF14-4292-8443-3BA79E4D84CC}"
+	RootNamespace="test"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -264,6 +265,9 @@
 			<File
 				RelativePath=".\testbail2.cpp">
 			</File>
+			<File
+				RelativePath=".\testlist.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"