diff --git a/dlls/fun/fun.cpp b/dlls/fun/fun.cpp
index 7c78fd28..a96b57ca 100755
--- a/dlls/fun/fun.cpp
+++ b/dlls/fun/fun.cpp
@@ -407,7 +407,8 @@ static cell AMX_NATIVE_CALL set_user_maxspeed(AMX *amx, cell *params) // set_use
 		return 0;
 	}
 
-	pPlayer->v.maxspeed = *(float *)((void *)&params[2]); // JGHG: Gotta love the way to get floats from parameters :-P
+	//pPlayer->v.maxspeed = ; // JGHG: Gotta love the way to get floats from parameters :-P
+	SETCLIENTMAXSPEED(pPlayer, *(float *)((void *)&params[2]));
 
 	return 1;
 }
diff --git a/dlls/fun/fun.h b/dlls/fun/fun.h
index 20868c90..19d5e9bd 100755
--- a/dlls/fun/fun.h
+++ b/dlls/fun/fun.h
@@ -68,17 +68,10 @@ pfnmodule_engine_g* g_engModuleFunc;		// These seem to be meta/amxmod related
 #define CVAR_FUN_VERSION		"fun_version"
 #define GETCLIENTLISTENING		(*g_engfuncs.pfnVoice_GetClientListening)
 #define SETCLIENTLISTENING		(*g_engfuncs.pfnVoice_SetClientListening)
+#define SETCLIENTMAXSPEED		(*g_engfuncs.pfnSetClientMaxspeed)
 #define	SF_NORESPAWN			(1 << 30)// !!!set this bit on guns and stuff that should never respawn.
 #define STANDARDTIMESTEPSOUND	400
 
-#if defined __linux__
-	#define OFFSET_CSMONEY		115 + 5
-	#define OFFSET_CSDEATHS		449 + 5
-#else
-	#define OFFSET_CSMONEY		115	// Note that linux offsets need to be 5 higher (120 in this case)
-	#define OFFSET_CSDEATHS		449
-#endif // defined __linux__
-
 #define HITGROUP_GENERIC		0 // none
 #define HITGROUP_HEAD			1
 #define HITGROUP_CHEST			2