diff --git a/decoders/connector/elsys/elt-2/v1.0.0/payload.js b/decoders/connector/elsys/elt-2/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/elt-2/v1.0.0/payload.js
+++ b/decoders/connector/elsys/elt-2/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/elt-lite/v1.0.0/payload.js b/decoders/connector/elsys/elt-lite/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/elt-lite/v1.0.0/payload.js
+++ b/decoders/connector/elsys/elt-lite/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/emk5/v1.0.0/payload.js b/decoders/connector/elsys/emk5/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/emk5/v1.0.0/payload.js
+++ b/decoders/connector/elsys/emk5/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ems-door/v1.0.0/payload.js b/decoders/connector/elsys/ems-door/v1.0.0/payload.js
index 35be7c28..95b51b7c 100644
--- a/decoders/connector/elsys/ems-door/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ems-door/v1.0.0/payload.js
@@ -268,7 +268,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ems/v1.0.0/payload.js b/decoders/connector/elsys/ems/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/ems/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ems/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ers-co2/v1.0.0/payload.js b/decoders/connector/elsys/ers-co2/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/ers-co2/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ers-co2/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ers-desk/v1.0.0/payload.js b/decoders/connector/elsys/ers-desk/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/ers-desk/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ers-desk/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ers-eye/v1.0.0/payload.js b/decoders/connector/elsys/ers-eye/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/ers-eye/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ers-eye/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ers-lite/v1.0.0/payload.js b/decoders/connector/elsys/ers-lite/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/ers-lite/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ers-lite/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ers-sound/v1.0.0/payload.js b/decoders/connector/elsys/ers-sound/v1.0.0/payload.js
index d5901c9a..b4fc1dfd 100644
--- a/decoders/connector/elsys/ers-sound/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ers-sound/v1.0.0/payload.js
@@ -222,7 +222,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];
diff --git a/decoders/connector/elsys/ers/v1.0.0/payload.js b/decoders/connector/elsys/ers/v1.0.0/payload.js
index 2e86b90a..88efb043 100644
--- a/decoders/connector/elsys/ers/v1.0.0/payload.js
+++ b/decoders/connector/elsys/ers/v1.0.0/payload.js
@@ -225,7 +225,7 @@ function Decoder(bytes, port) {
 
 const data = payload.find(x => x.variable === 'data' || x.variable === 'payload');
 if (data) {
-  const group = data.group || new Date().getTime();
+  const group = String(data.group || Date.now());
   const vars_to_tago = Decoder(Buffer.from(data.value, 'hex'));
 
   payload = [...payload, ...toTagoFormat(vars_to_tago, group, '', vars_to_tago.location)];