diff --git a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/EMsgExtensions.cs b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/EMsgExtensions.cs
index 278ed616..1d1ba139 100644
--- a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/EMsgExtensions.cs
+++ b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/EMsgExtensions.cs
@@ -16,6 +16,7 @@ namespace NetHookAnalyzer2
 			Type[] eMsgEnums =
 			{
 				typeof( SteamKit2.GC.Dota.Internal.EDOTAGCMsg ),
+				typeof( SteamKit2.GC.CSGO.Internal.ECsgoGCMsg ),
 				typeof( SteamKit2.GC.Internal.EGCBaseMsg ),
 				typeof( SteamKit2.GC.Internal.ESOMsg ),
 				typeof( SteamKit2.GC.Internal.EGCSystemMsg ),
diff --git a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/MessageTypeFinder.cs b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/MessageTypeFinder.cs
index b3111174..ff8dfdf0 100644
--- a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/MessageTypeFinder.cs
+++ b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/MessageTypeFinder.cs
@@ -40,11 +40,11 @@ namespace NetHookAnalyzer2
 			var gcMsgName = EMsgExtensions.GetGCMessageName(rawEMsg);
 
 			var typeMsgName = gcMsgName
-				.Replace("GC", string.Empty)
 				.Replace("k_", string.Empty)
 				.Replace("ESOMsg", string.Empty)
 				.TrimStart('_')
-				.Replace("EMsg", string.Empty);
+				.Replace("EMsg", string.Empty)
+				.TrimStart("GC");
 
 			var possibleTypes = from type in typeof(CMClient).Assembly.GetTypes()
 								from typePrefix in GetPossibleGCTypePrefixes(gcAppid)
diff --git a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/NetHookAnalyzer2.csproj b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/NetHookAnalyzer2.csproj
index 09cc554d..691df270 100644
--- a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/NetHookAnalyzer2.csproj
+++ b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/NetHookAnalyzer2.csproj
@@ -67,6 +67,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProtoBufFieldReader.cs" />
     <Compile Include="SteamUtils.cs" />
+    <Compile Include="StringExtensions.cs" />
     <Compile Include="TypeExtensions.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
diff --git a/Resources/NetHookAnalyzer2/NetHookAnalyzer2/StringExtensions.cs b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/StringExtensions.cs
new file mode 100644
index 00000000..862c85b5
--- /dev/null
+++ b/Resources/NetHookAnalyzer2/NetHookAnalyzer2/StringExtensions.cs
@@ -0,0 +1,15 @@
+namespace NetHookAnalyzer2
+{
+	static class StringExtensions
+	{
+		public static string TrimStart(this string baseString, string startToTrim)
+		{
+			if (baseString.IndexOf(startToTrim) == 0)
+			{
+				return baseString.Substring(startToTrim.Length);
+			}
+
+			return baseString;
+		}
+	}
+}