diff --git a/src/modules/exec/ButtonIn/ButtonIn.cpp b/src/modules/exec/ButtonIn/ButtonIn.cpp
index ce7eed7f..8184bf43 100644
--- a/src/modules/exec/ButtonIn/ButtonIn.cpp
+++ b/src/modules/exec/ButtonIn/ButtonIn.cpp
@@ -65,6 +65,11 @@ class ButtonIn : public IoTItem {
         _lastButtonState = _reading;
     }
 
+    void setValue(IoTValue Value) {
+        value = Value;
+        regEvent((String)(int)value.valD, "ButtonIn");
+    }
+
     ~ButtonIn() {};
 };
 
diff --git a/src/modules/exec/ButtonOut/ButtonOut.cpp b/src/modules/exec/ButtonOut/ButtonOut.cpp
index 3f7ee697..994792b4 100644
--- a/src/modules/exec/ButtonOut/ButtonOut.cpp
+++ b/src/modules/exec/ButtonOut/ButtonOut.cpp
@@ -42,8 +42,7 @@ class ButtonOut : public IoTItem {
     void setValue(IoTValue Value) {
         value = Value;
         IoTgpio.digitalWrite(_pin, _inv?!value.valD:value.valD);
-        if (value.isDecimal) regEvent(value.valD, "ButtonOut");
-        else regEvent(value.valS, "ButtonOut");
+        regEvent((String)(int)value.valD, "ButtonOut");
     }
     //=======================================================================================================
 
diff --git a/src/modules/virtual/VButton/VButton.cpp b/src/modules/virtual/VButton/VButton.cpp
index 6bfcb5ea..caa09997 100644
--- a/src/modules/virtual/VButton/VButton.cpp
+++ b/src/modules/virtual/VButton/VButton.cpp
@@ -8,7 +8,7 @@ class VButton : public IoTItem {
 
     void setValue(IoTValue Value) {
         value = Value;
-        regEvent((String)(int)value.valD, "");
+        regEvent((String)(int)value.valD, "VButton");
     }
 
     void doByInterval() { }