diff --git a/src/InputStream.c b/src/InputStream.c
index 587902d..ffe5f79 100644
--- a/src/InputStream.c
+++ b/src/InputStream.c
@@ -1072,7 +1072,7 @@ static int sendControllerEventInternal(short controllerNumber, short activeGamep
 }
 
 // Send a controller event to the streaming machine
-int LiSendControllerEvent(short buttonFlags, unsigned char leftTrigger, unsigned char rightTrigger,
+int LiSendControllerEvent(int buttonFlags, unsigned char leftTrigger, unsigned char rightTrigger,
     short leftStickX, short leftStickY, short rightStickX, short rightStickY)
 {
     return sendControllerEventInternal(0, 0x1, buttonFlags, leftTrigger, rightTrigger,
diff --git a/src/Limelight.h b/src/Limelight.h
index bc940e7..d65d727 100644
--- a/src/Limelight.h
+++ b/src/Limelight.h
@@ -717,7 +717,7 @@ int LiSendUtf8TextEvent(const char *text, unsigned int length);
 
 // This function queues a controller event to be sent to the remote server. It will
 // be seen by the computer as the first controller.
-int LiSendControllerEvent(short buttonFlags, unsigned char leftTrigger, unsigned char rightTrigger,
+int LiSendControllerEvent(int buttonFlags, unsigned char leftTrigger, unsigned char rightTrigger,
     short leftStickX, short leftStickY, short rightStickX, short rightStickY);
 
 // This function queues a controller event to be sent to the remote server. The controllerNumber