diff --git a/extensions/tf2/conditions.cpp b/extensions/tf2/conditions.cpp
index 95b55756c..d298df4e9 100644
--- a/extensions/tf2/conditions.cpp
+++ b/extensions/tf2/conditions.cpp
@@ -159,7 +159,7 @@ void PlayerConditionsMgr::Shutdown()
 
 void PlayerConditionsMgr::OnClientPutInServer(int client)
 {
-	memset(&m_OldConds[client], 0, CondVar_Count * sizeof(int));
+	memset(&m_OldConds[client], 0, sizeof(m_OldConds[0]));
 }
 
 PlayerConditionsMgr g_CondMgr;
\ No newline at end of file
diff --git a/extensions/tf2/conditions.h b/extensions/tf2/conditions.h
index 6ae42e6f0..76193c139 100644
--- a/extensions/tf2/conditions.h
+++ b/extensions/tf2/conditions.h
@@ -68,9 +68,9 @@ private:
 	template<CondVar var>
 	bool SetupProp(const char *varname);
 private:
-	int m_OldConds[TF_MAXPLAYERS + 1][CondVar_Count];
+	int m_OldConds[SM_MAXPLAYERS + 1][CondVar_LastNotifyProp];
 	sm_sendprop_info_t m_CondVarProps[CondVar_Count];
-	SendVarProxyFn m_BackupProxyFns[CondVar_Count];
+	SendVarProxyFn m_BackupProxyFns[CondVar_LastNotifyProp];
 };
 
 extern PlayerConditionsMgr g_CondMgr;
diff --git a/extensions/tf2/extension.h b/extensions/tf2/extension.h
index 535af282a..d9b223340 100644
--- a/extensions/tf2/extension.h
+++ b/extensions/tf2/extension.h
@@ -42,8 +42,6 @@
 #include <server_class.h>
 #include <igameevents.h>
 
-const int TF_MAXPLAYERS = 33;
-
 namespace SourceMod {
 	class ISDKTools;
 }