diff --git a/src/core.c b/src/core.c
index 45615f833..d786bc4c0 100644
--- a/src/core.c
+++ b/src/core.c
@@ -3109,7 +3109,6 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
             lastKeyPressed = keycode;
         }
         else currentKeyState[keycode] = 0;  // Key up
-
     }
     else if (type == AINPUT_EVENT_TYPE_KEY)
     {
@@ -3163,6 +3162,7 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
     gestureEvent.pointCount = AMotionEvent_getPointerCount(event);
 
     // Only enable gestures for 1-3 touch points
+    // @Todo: If someone is using a gamepad and hits 1-3 buttons, then this condition will be satisfied and the system will crash
     if ((gestureEvent.pointCount > 0) && (gestureEvent.pointCount < 4))
     {
         // Register touch points id
diff --git a/src/external/glfw/include/GLFW/glfw3.h b/src/external/glfw/include/GLFW/glfw3.h
index 990fe3f7f..4a84371d9 100644
--- a/src/external/glfw/include/GLFW/glfw3.h
+++ b/src/external/glfw/include/GLFW/glfw3.h
@@ -480,6 +480,7 @@ extern "C" {
 #define GLFW_KEY_RIGHT_SUPER        347
 #define GLFW_KEY_MENU               348
 
+#define GLFW_KEY_FIRST              19
 #define GLFW_KEY_LAST               GLFW_KEY_MENU
 
 /*! @} */
diff --git a/src/external/glfw/src/input.c b/src/external/glfw/src/input.c
index b0bb3de47..91ddf0def 100644
--- a/src/external/glfw/src/input.c
+++ b/src/external/glfw/src/input.c
@@ -579,7 +579,7 @@ GLFWAPI int glfwGetKeyScancode(int key)
 {
     _GLFW_REQUIRE_INIT_OR_RETURN(-1);
 
-    if (key < GLFW_KEY_SPACE || key > GLFW_KEY_LAST)
+    if (key < GLFW_KEY_FIRST || key > GLFW_KEY_LAST)
     {
         _glfwInputError(GLFW_INVALID_ENUM, "Invalid key %i", key);
         return GLFW_RELEASE;
@@ -595,7 +595,7 @@ GLFWAPI int glfwGetKey(GLFWwindow* handle, int key)
 
     _GLFW_REQUIRE_INIT_OR_RETURN(GLFW_RELEASE);
 
-    if (key < GLFW_KEY_SPACE || key > GLFW_KEY_LAST)
+    if (key < GLFW_KEY_FIRST || key > GLFW_KEY_LAST)
     {
         _glfwInputError(GLFW_INVALID_ENUM, "Invalid key %i", key);
         return GLFW_RELEASE;