diff --git a/src/input_handler.c b/src/input_handler.c
index dcff77e..ad8da1f 100644
--- a/src/input_handler.c
+++ b/src/input_handler.c
@@ -2,6 +2,8 @@
 #include "input_handler.h"
 #include "timer_counter.h"
 
+typedef void (*ButtonRoutine_t)(ButtonKey_t *);
+
 const ButtonRoutine_t button_routine[MAX_STATE];
 
 void buttonHandler(ButtonKey_t *key)
diff --git a/src/input_handler.h b/src/input_handler.h
index ea1c2fd..29ab1c3 100644
--- a/src/input_handler.h
+++ b/src/input_handler.h
@@ -33,14 +33,12 @@ struct ButtonKey
 
     GPIO_PinState active_state; // The state when the button is active (pressed)
 
-    uint8_t last_tick;          // Last remembered time before steps
-    uint8_t timer_debounce_on;  // Fixed, settable time for debounce timer
-    uint8_t timer_debounce_off; // Fixed, settable time for debounce timer
+    uint16_t last_tick;          // Last remembered time before steps
+    uint16_t timer_debounce_on;  // Fixed, settable time for debounce timer
+    uint16_t timer_debounce_off; // Fixed, settable time for debounce timer
 
     buttonPressed_t buttonReleased; // A callback for button released
     buttonPressed_t buttonPressed;  // A callback for button pressed
 };
 
-typedef void (*ButtonRoutine_t)(ButtonKey_t *);
-
 void buttonHandler(ButtonKey_t *key);
\ No newline at end of file