diff --git a/Windows_Libs/Dev/Input/INP_Main.cpp b/Windows_Libs/Dev/Input/INP_Main.cpp
index 26a0b79..a61f74e 100644
--- a/Windows_Libs/Dev/Input/INP_Main.cpp
+++ b/Windows_Libs/Dev/Input/INP_Main.cpp
@@ -549,7 +549,7 @@ bool CInput::UpdateJoypads()
 {
 	assert(m_bJoypadMapArrayIsSetup);
 
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < MAX_JOYPADS; i++)
 	{
 		JOYPAD* pThisPad = &m_Joypads[i];
 
@@ -563,7 +563,7 @@ bool CInput::UpdateJoypads()
 		pThisPad->m_ucRightTriggerState = 0;
 	}
 
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < MAX_JOYPADS; i++)
 	{
 		if (!m_Joypads[i].m_bIsDisabled)
 		{
@@ -685,7 +685,7 @@ void CInput::InitTime(void)
 	QueryPerformanceFrequency(&qwTicksPerSec);
 
 	m_fTickToSeconds = 1.0 / (float)(int)qwTicksPerSec.LowPart;
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < MAX_JOYPADS; i++)
 	{
 		m_LastActivityTime[i].QuadPart = 0;
 	}
diff --git a/Windows_Libs/Dev/Input/INP_Main.h b/Windows_Libs/Dev/Input/INP_Main.h
index ebc7750..388fbf1 100644
--- a/Windows_Libs/Dev/Input/INP_Main.h
+++ b/Windows_Libs/Dev/Input/INP_Main.h
@@ -121,7 +121,7 @@ public:
 
 	BYTE gap0[16];
 
-	JOYPAD m_Joypads[4];
+	JOYPAD m_Joypads[MAX_JOYPADS];
 
 	int m_iDeadzone;
 	int m_iMovementRangeMax;
@@ -150,8 +150,8 @@ public:
 	float m_fRepeatDelaySecs;
 	float m_fRepeatRateSecs;
 
-	TimeInfo m_Timers[4][24];
-	LARGE_INTEGER m_LastActivityTime[4];
+	TimeInfo m_Timers[MAX_JOYPADS][24];
+	LARGE_INTEGER m_LastActivityTime[MAX_JOYPADS];
 
 	char* m_sDebugSequenceName;
 	unsigned int m_uiDebugSequenceIndex;