diff --git a/include/input_mapper.h b/include/input_mapper.h
index 4f958c4..b63fef8 100644
--- a/include/input_mapper.h
+++ b/include/input_mapper.h
@@ -30,7 +30,7 @@ namespace InputMapper
     
     extern uint16_t button_map[];
 
-    void mapButton(HardwareButtons button, bool value);
+    bool mapButton(HardwareButtons button, bool value);
 
     // void mapGyro();
 
diff --git a/src/input_mapper.cpp b/src/input_mapper.cpp
index 9eae6a7..145a5f5 100644
--- a/src/input_mapper.cpp
+++ b/src/input_mapper.cpp
@@ -126,6 +126,8 @@ namespace InputMapper
         pos_x = 20.636 * ppmX;
         pos_y = 20.636 * ppmY;
         pos_r = 45 * ppmX / 2;
+        dead_zone_inner = 8 * ppmX;
+
         tdpad_right.init(pos_x, pos_y, pos_r, TouchDpad::DPAD_TYPE_SECTOR_4);
         tdpad_right.setDeadZoneInner(dead_zone_inner);
 
@@ -294,7 +296,7 @@ namespace InputMapper
         device.triggers(mapped_value);
     }
 
-    void mapButton(HardwareButtons button, bool value)
+    bool mapButton(HardwareButtons button, bool value)
     {   
         uint8_t id;
 
@@ -310,16 +312,21 @@ namespace InputMapper
             
             default:
                 modifyCounter(button_map[button], value);
-                return;
+                return true;
         }
 
+        uint8_t res = 0;
+
         for (uint8_t c = 0; c < num_controls; ++c)
         {
             if (tcontrols[id][c]->getTouching() > TouchControl::CT_NONE || !value)
             {
                 modifyCounter(button_tp_map[id][c], value);
+                ++res;
             }
         }
+
+        return res;
     }
 
     void sendReport()
diff --git a/src/main.cpp b/src/main.cpp
index 0f332de..d3be764 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -125,8 +125,10 @@ void loop()
         uint8_t value = digitalRead(pin_button[i]);
         if (value != button_state[i / 2])
         {
-            button_state[i / 2] = value;
-            InputMapper::mapButton((InputMapper::HardwareButtons)(i / 2), value == pin_button[i + 1]);
+            if (InputMapper::mapButton((InputMapper::HardwareButtons)(i / 2), value == pin_button[i + 1]))
+            {
+                button_state[i / 2] = value;
+            }
         }
     }