diff --git a/wpilibj/src/athena/cpp/lib/HAL.cpp b/wpilibj/src/athena/cpp/lib/HAL.cpp
index f7fab3642b..162e317e02 100644
--- a/wpilibj/src/athena/cpp/lib/HAL.cpp
+++ b/wpilibj/src/athena/cpp/lib/HAL.cpp
@@ -188,9 +188,9 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickPOVs(JNIEnv* env, jclass,
 /*
  * Class: edu_wpi_first_wpilibj_hal_HAL
  * Method:    HAL_GetJoystickButtons
- * Signature: (BL)B
+ * Signature: (BL)I
  */
-JNIEXPORT jbyte JNICALL
+JNIEXPORT jint JNICALL
 Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickButtons(JNIEnv* env, jclass,
                                                       jbyte joystickNum,
                                                       jobject count) {
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java
index c01a5f3c68..416eeb69b4 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java
@@ -92,7 +92,7 @@ public class HAL extends JNIWrapper {
 
   public static native short getJoystickPOVs(byte joystickNum, short[] povsArray);
 
-  public static native byte getJoystickButtons(byte joystickNum, ByteBuffer count);
+  public static native int getJoystickButtons(byte joystickNum, ByteBuffer count);
 
   public static native int setJoystickOutputs(byte joystickNum, int outputs, short leftRumble,
                                               short rightRumble);