diff --git a/scenes/editor_scene.c b/scenes/editor_scene.c
index bd9914f..7a9aeda 100644
--- a/scenes/editor_scene.c
+++ b/scenes/editor_scene.c
@@ -439,7 +439,7 @@ static void level_scene_render_func(Scene_t* scene)
             DrawText(buffer, gui_x + 80, gui_y, 12, BLACK);
 
             gui_y += 45;
-            sprintf(buffer, "Jumps: %u", p_cjump->jumps);
+            sprintf(buffer, "Jumps: %u, %u", p_cjump->jumps, p_cjump->jump_released);
             DrawText(buffer, gui_x, gui_y, 12, BLACK);
             gui_y += 30;
             sprintf(buffer, "Crouch: %u", p_pstate->is_crouch);
diff --git a/scenes/engine/EC/EC.h b/scenes/engine/EC/EC.h
index e1e366b..cf8301a 100644
--- a/scenes/engine/EC/EC.h
+++ b/scenes/engine/EC/EC.h
@@ -71,12 +71,13 @@ typedef struct _CTileCoord_t {
 } CTileCoord_t;
 
 typedef struct _CJump_t {
-    unsigned int jumps;
-    unsigned int max_jumps;
     int jump_speed;
+    uint8_t jumps;
+    uint8_t max_jumps;
     bool jumped;
     bool jump_ready;
     bool short_hop;
+    bool jump_released;
 } CJump_t;
 
 typedef enum PlayerState {
diff --git a/scenes/game_systems.c b/scenes/game_systems.c
index 457c257..3d48a18 100644
--- a/scenes/game_systems.c
+++ b/scenes/game_systems.c
@@ -337,6 +337,7 @@ void player_movement_input_system(Scene_t* scene)
         {
             if (!p_pstate->jump_pressed)
             {
+                p_cjump->jump_released = true;
                 if (!p_cjump->short_hop && p_ctransform->velocity.y < 0)
                 {
                     p_cjump->short_hop = true;
@@ -359,7 +360,7 @@ void player_movement_input_system(Scene_t* scene)
         // Jumps is possible as long as you have a jump
 
         // Check if possible to jump when jump is pressed
-        if (p_pstate->jump_pressed && p_cjump->jumps > 0 && p_cjump->jump_ready)
+        if (p_cjump->jump_released && p_pstate->jump_pressed && p_cjump->jumps > 0 && p_cjump->jump_ready)
         {
             p_pstate->ladder_state = false;
             p_cjump->jumps--;
@@ -381,8 +382,8 @@ void player_movement_input_system(Scene_t* scene)
 
             p_cjump->jumped = true;
             p_cjump->jump_ready = false;
+            p_cjump->jump_released = false;
         }
-
     }
 }
 
@@ -1225,11 +1226,12 @@ void player_ground_air_transition_system(Scene_t* scene)
         // Handle Ground<->Air Transition
         bool in_water = (p_mstate->water_state & 1);
         // Landing or in water
-        if ((p_mstate->ground_state & 1 || in_water || p_pstate->ladder_state) && !p_pstate->jump_pressed )
+        if ((p_mstate->ground_state & 1 || in_water || p_pstate->ladder_state))
         {
             // Recover jumps
             p_cjump->jumps = p_cjump->max_jumps;
             p_cjump->jumped = false;
+            if(!p_cjump->jump_released && !p_pstate->jump_pressed) p_cjump->jump_released = true;
             p_cjump->short_hop = false;
             p_cjump->jump_ready = true;
         }