diff --git a/gateway/include/RcDecoder.h b/gateway/include/RcDecoder.h
index f3b59cf..d29362a 100644
--- a/gateway/include/RcDecoder.h
+++ b/gateway/include/RcDecoder.h
@@ -7,10 +7,10 @@ namespace RcDecoder {
     struct RcSwitch {
         bool state;
         char group;
-        char device;
+        byte device;
     };
 
-    void decode(unsigned long value, RcSwitch decoded) {
+    void decode(unsigned long value, RcSwitch& decoded) {
         value = value >> 2;
         unsigned long res = 0;
         for (int i = 0; i < 12; i++) {
diff --git a/gateway/src/gateway.cpp b/gateway/src/gateway.cpp
index 0ed9238..4874ca3 100644
--- a/gateway/src/gateway.cpp
+++ b/gateway/src/gateway.cpp
@@ -99,7 +99,7 @@ void readRcSwitch(JsonDocument& jsonDoc) {
 			RcDecoder::RcSwitch decoded;
 			RcDecoder::decode(value, decoded);
 			rcSwitch["state"] = decoded.state;
-			rcSwitch["group"] = decoded.group;
+			rcSwitch["group"] = String(decoded.group, BIN);
 			rcSwitch["channel"] = decoded.device;
 		} else {
 			rcSwitch["value"] = value;