diff --git a/dlls/dod2/dodx/moduleconfig.cpp b/dlls/dod2/dodx/moduleconfig.cpp
index 7794e04f..82c769e5 100755
--- a/dlls/dod2/dodx/moduleconfig.cpp
+++ b/dlls/dod2/dodx/moduleconfig.cpp
@@ -187,6 +187,8 @@ void ServerDeactivate() {
 	for ( i=DODMAX_WEAPONS-DODMAX_CUSTOMWPNS;i<DODMAX_WEAPONS;i++)
 		weaponData[i].needcheck = false;
 
+	g_map.Init();
+
 	RETURN_META(MRES_IGNORED);
 }
 
@@ -379,10 +381,7 @@ void OnAmxxAttach() {
 		g_rank.loadRank( MF_BuildPathname("%s",
 			get_localinfo("dodstats","addons/amxmodx/data/dodstats.dat") ) );
 	}
-}
 
-void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
-{
 	g_map.Init();
 }
 
diff --git a/dlls/dod2/dodx/moduleconfig.h b/dlls/dod2/dodx/moduleconfig.h
index 40ccabe0..1a91ecfc 100755
--- a/dlls/dod2/dodx/moduleconfig.h
+++ b/dlls/dod2/dodx/moduleconfig.h
@@ -75,7 +75,7 @@
 // #define FN_ClientPutInServer			ClientPutInServer			/* pfnClientPutInServer()		(wd) Client is entering the game */
 // #define FN_ClientCommand				ClientCommand				/* pfnClientCommand()			(wd) Player has sent a command (typed or from a bind) */
 // #define FN_ClientUserInfoChanged		ClientUserInfoChanged		/* pfnClientUserInfoChanged()	(wd) Client has updated their setinfo structure */
-#define FN_ServerActivate			ServerActivate				/* pfnServerActivate()			(wd) Server is starting a new map */
+// #define FN_ServerActivate			ServerActivate				/* pfnServerActivate()			(wd) Server is starting a new map */
 #define FN_ServerDeactivate			ServerDeactivate			/* pfnServerDeactivate()		(wd) Server is leaving the map (shutdown or changelevel); SDK2 */
 // #define FN_PlayerPreThink			PlayerPreThink				/* pfnPlayerPreThink() */
 // #define FN_PlayerPostThink			PlayerPostThink				/* pfnPlayerPostThink() */