diff --git a/src/java/org/lwjgl/opengl/WindowsKeyboard.java b/src/java/org/lwjgl/opengl/WindowsKeyboard.java
index 57afced7..47b4ed77 100644
--- a/src/java/org/lwjgl/opengl/WindowsKeyboard.java
+++ b/src/java/org/lwjgl/opengl/WindowsKeyboard.java
@@ -70,7 +70,7 @@ final class WindowsKeyboard {
 			throw e;
 		}
 		keyboard.acquire();
-		temp_data_buffer = BufferUtils.createIntBuffer(BUFFER_SIZE*2);
+		temp_data_buffer = BufferUtils.createIntBuffer(BUFFER_SIZE*WindowsDirectInputDevice.DATA_SIZE);
 		keyboard_state = BufferUtils.createByteBuffer(256);
 		unicode_buffer = BufferUtils.createCharBuffer(BUFFER_SIZE);
 	}
diff --git a/src/java/org/lwjgl/opengl/WindowsMouse.java b/src/java/org/lwjgl/opengl/WindowsMouse.java
index e4046164..6decfcf6 100644
--- a/src/java/org/lwjgl/opengl/WindowsMouse.java
+++ b/src/java/org/lwjgl/opengl/WindowsMouse.java
@@ -100,7 +100,7 @@ final class WindowsMouse {
 		this.mouse_button_count = Math.min(enumerator.getButtonCount(), 4);
 		this.has_wheel = enumerator.hasWheel();
 		mouse_state = BufferUtils.createByteBuffer(3*4 + 4);
-		temp_data_buffer = BufferUtils.createIntBuffer(BUFFER_SIZE*2);
+		temp_data_buffer = BufferUtils.createIntBuffer(BUFFER_SIZE*WindowsDirectInputDevice.DATA_SIZE);
 	}
 
 	public boolean hasWheel() {