diff --git a/core/sourcemm_api.cpp b/core/sourcemm_api.cpp
index ce1f4b43..285b44b3 100644
--- a/core/sourcemm_api.cpp
+++ b/core/sourcemm_api.cpp
@@ -72,15 +72,18 @@ bool SourceMod_Core::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen
 	GET_V_IFACE_ANY(GetServerFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
 #if SOURCE_ENGINE == SE_TF2 || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_SDK2013
 	// Shim to avoid hooking shims
-	engine = (IVEngineServer *)ismm->VInterfaceMatch(ismm->GetEngineFactory(), "VEngineServer023");
+	engine = (IVEngineServer *)ismm->GetEngineFactory()("VEngineServer023", nullptr);
 	if (!engine)
 	{
-		engine = (IVEngineServer *)ismm->VInterfaceMatch(ismm->GetEngineFactory(), "VEngineServer022");
-		if (error && maxlen)
+		engine = (IVEngineServer *)ismm->GetEngineFactory()("VEngineServer022", nullptr);
+		if (!engine)
 		{
-			ismm->Format(error, maxlen, "Could not find interface: VEngineServer023 or VEngineServer022");
+			if (error && maxlen)
+			{
+				ismm->Format(error, maxlen, "Could not find interface: VEngineServer023 or VEngineServer022");
+			}
+			return false;
 		}
-		return false;
 	}
 #else
 	GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);