diff --git a/sourcemm/episode2/vsp_listener.cpp b/sourcemm/episode2/vsp_listener.cpp
index d3c4b27..4651c2f 100644
--- a/sourcemm/episode2/vsp_listener.cpp
+++ b/sourcemm/episode2/vsp_listener.cpp
@@ -213,16 +213,7 @@ bool VSPListener::Load(CreateInterfaceFn interfaceFactory, CreateInterfaceFn gam
 		InitializeGlobals(interfaceFactory, interfaceFactory, interfaceFactory, pGlobals);
 		StartupMetamod(true);
 		
-		const ConCommandBase *pBase = icvar->GetCommands();
-		while (pBase != NULL)
-		{
-			if (pBase->IsCommand() && strcmp(pBase->GetName(), "plugin_unload") == 0)
-			{
-				g_plugin_unload = (ConCommand *)pBase;
-				break;
-			}
-			pBase = pBase->GetNext();
-		}
+		g_plugin_unload = icvar->FindCommand("plugin_unload");
 
 		if (g_plugin_unload != NULL)
 		{