diff --git a/addons/sourcemod/gamedata/shavit.games.txt b/addons/sourcemod/gamedata/shavit.games.txt
index d31c1246..2368c0ad 100644
--- a/addons/sourcemod/gamedata/shavit.games.txt
+++ b/addons/sourcemod/gamedata/shavit.games.txt
@@ -11,8 +11,9 @@
 
 		"Signatures"
 		{
-			"CreateInterface"
+			"CreateInterface_Server"
 			{
+				"library"   "server"
 				"windows"   "@CreateInterface"
 				"linux"     "@CreateInterface"
 			}
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index e87fcab3..57df86dd 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -420,7 +420,7 @@ void LoadDHooks()
 	}
 
 	StartPrepSDKCall(SDKCall_Static);
-	if(!PrepSDKCall_SetFromConf(gamedataConf, SDKConf_Signature, "CreateInterface"))
+	if(!PrepSDKCall_SetFromConf(gamedataConf, SDKConf_Signature, "CreateInterface_Server"))
 	{
 		SetFailState("Failed to get CreateInterface");
 	}