diff --git a/gamedata/eventfix.games.txt b/gamedata/eventfix.games.txt
index 5c54838..342a537 100644
--- a/gamedata/eventfix.games.txt
+++ b/gamedata/eventfix.games.txt
@@ -44,6 +44,10 @@
 				"windows"	"12"
 				"linux"		"12"
 			}
+			"FindEntityByName_StaticCall"
+			{
+				"windows" "1"
+			}
 		}
 	}
 	"cstrike"
@@ -77,4 +81,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/scripting/eventqueuefix.sp b/scripting/eventqueuefix.sp
index ab703a6..1121521 100644
--- a/scripting/eventqueuefix.sp
+++ b/scripting/eventqueuefix.sp
@@ -1,6 +1,5 @@
 
 //#define DEBUG
-//#define CSGO_WIN
 
 #define PLUGIN_NAME           "EventQueue fix"
 #define PLUGIN_AUTHOR         "carnifex"
@@ -166,11 +165,10 @@ void LoadDHooks()
 	int ibuff = gamedataConf.GetOffset("m_angRotation");
 	g_iRefOffset = ibuff + m_RefEHandleOff;
 	
-	#if defined CSGO_WIN
+	if (gamedataConf.GetOffset("FindEntityByName_StaticCall") == 1)
 		StartPrepSDKCall(SDKCall_Static);
-	#else
+	else
 		StartPrepSDKCall(SDKCall_EntityList);
-	#endif
 	
 	PrepSDKCall_SetFromConf(gamedataConf, SDKConf_Signature, "FindEntityByName");
 	PrepSDKCall_SetReturnInfo(SDKType_PlainOldData, SDKPass_ByValue);