diff --git a/src/native/win32/org_lwjgl_input_Joystick.cpp b/src/native/win32/org_lwjgl_input_Joystick.cpp
index b2995a63..3b21678d 100644
--- a/src/native/win32/org_lwjgl_input_Joystick.cpp
+++ b/src/native/win32/org_lwjgl_input_Joystick.cpp
@@ -354,7 +354,7 @@ void UpdateFields() {
   //buttons
   jbooleanArray buttonsArray = (jbooleanArray) environment->GetStaticObjectField(clsJoystick, fidButtons);
   BYTE * buttons = (BYTE *) environment->GetPrimitiveArrayCritical(buttonsArray, NULL);
-  memcpy(buttons, js.rgbButtons, 4);
+  memcpy(buttons, js.rgbButtons, buttoncount);
   environment->ReleasePrimitiveArrayCritical(buttonsArray, buttons, 0);
 
   //pov