diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h
index 07b87661c..e53a7c83d 100644
--- a/sonoff/sonoff.h
+++ b/sonoff/sonoff.h
@@ -231,7 +231,7 @@ enum Ws2812Color { WS_RED, WS_GREEN, WS_BLUE };
 
 enum LightSubtypes { LST_NONE, LST_SINGLE, LST_COLDWARM, LST_RGB,   LST_RGBW, LST_RGBWC };                   // Do not insert new fields
 enum LightTypes    { LT_BASIC, LT_PWM1,    LT_PWM2,      LT_PWM3,   LT_PWM4,  LT_PWM5,  LT_PWM6, LT_PWM7,
-                     LT_NU8,   LT_SERIAL1, LT_SERIAL2,   LT_WS2812, LT_RGBW,  LT_RGBWC, LT_SERIAL3, LT_NU15 };  // Do not insert new fields
+                     LT_NU8,   LT_SERIAL1, LT_SERIAL2,   LT_WS2812, LT_RGBW,  LT_RGBWC, LT_NU14, LT_NU15 };  // Do not insert new fields
 
 enum LightSchemes {LS_POWER, LS_WAKEUP, LS_CYCLEUP, LS_CYCLEDN, LS_RANDOM, LS_MAX};
 
diff --git a/sonoff/xdrv_04_light.ino b/sonoff/xdrv_04_light.ino
index d306bc974..455adc4d0 100644
--- a/sonoff/xdrv_04_light.ino
+++ b/sonoff/xdrv_04_light.ino
@@ -842,7 +842,7 @@ void LightAnimate(void)
       }
 #endif  // USE_ARMTRONIX_DIMMERS
 #ifdef USE_PS_16_DZ
-      if (light_type == LT_SERIAL3) {
+      if (light_type == LT_SERIAL1) {
         PS16DZSerialDuty(cur_col[0]);
       }
 #endif  // USE_PS_16_DZ
diff --git a/sonoff/xdrv_19_ps16dz_dimmer.ino b/sonoff/xdrv_19_ps16dz_dimmer.ino
index 82f81eefa..fb43e31d2 100644
--- a/sonoff/xdrv_19_ps16dz_dimmer.ino
+++ b/sonoff/xdrv_19_ps16dz_dimmer.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_16_ps16dzdimmer.ino - PS16DZ dimmer support for Sonoff-Tasmota
+  xdrv_16_ps16dz_dimmer.ino - PS16DZ dimmer support for Sonoff-Tasmota
 
   Copyright (C) 2018 Joel Stein and Theo Arends
 
@@ -42,6 +42,31 @@ int ps16dz_byte_counter = 0;                  // Index in serial receive buffer
 \*********************************************************************************************/
 
 
+size_t print_uint64_t(uint64_t number)
+{
+    size_t n = 0;
+    unsigned char buf[21];
+    uint8_t i = 0;
+
+    if (number == 0)
+    {
+        n += snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "%s%c"), ps16dz_buffer, (char)'0');
+        return n;
+    }
+
+    while (number > 0)
+    {
+        uint64_t q = number/10;
+        buf[i++] = number - q*10;
+        number = q;
+    }
+
+    for (; i > 0; i--)
+    n += snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "%s%c"), ps16dz_buffer, (char) ('0' + buf[i - 1])); 
+
+    return n;
+}
+
 boolean PS16DZSetPower(void)
 {
   boolean status = false;
@@ -51,7 +76,9 @@ boolean PS16DZSetPower(void)
 
   if (source != SRC_SWITCH && PS16DZSerial) {  // ignore to prevent loop from pushing state from faceplate interaction
 
-    snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "AT+UPDATE=\"sequence\":\"%lld\",\"switch\":\"%s\""), ps16dz_seq++, rpower?"on":"off");
+    snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "AT+UPDATE=\"sequence\":\""));
+    print_uint64_t(ps16dz_seq++);
+    snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "%s\",\"switch\":\"%s\""), ps16dz_buffer, rpower?"on":"off");
     snprintf_P(log_data, sizeof(log_data), PSTR( "PSD: Send serial command: %s"), ps16dz_buffer );
     AddLog(LOG_LEVEL_DEBUG);
     
@@ -70,7 +97,9 @@ void PS16DZSerialDuty(uint8_t duty)
       duty = 25;  // dimming acts odd below 25(10%) - this mirrors the threshold set on the faceplate itself
     }
 
-    snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "AT+UPDATE=\"sequence\":\"%lld\",\"bright\":\"%d\""), ps16dz_seq++, duty/(255./100.));
+    snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "AT+UPDATE=\"sequence\":\""));
+    print_uint64_t(ps16dz_seq++);
+    snprintf_P(ps16dz_buffer, sizeof(ps16dz_buffer), PSTR( "%s\",\"bright\":\"%d\""), ps16dz_buffer, round(duty * (100. / 255.)));
     snprintf_P(log_data, sizeof(log_data), PSTR( "PSD: Send serial command: %s"), ps16dz_buffer );
     AddLog(LOG_LEVEL_DEBUG);
     
@@ -101,7 +130,7 @@ void PS16DZResetWifi(void)
 
 boolean PS16DZModuleSelected(void)
 {
-  light_type = LT_SERIAL3;
+  light_type = LT_SERIAL1;
   return true;
 }
 
@@ -158,7 +187,7 @@ void PS16DZSerialInput(void)
         }
         else if(!strncmp(token2, "\"sequence\"", 10)){
           ps16dz_seq = strtoull(token3, NULL, 10);
-          snprintf_P(log_data, sizeof(log_data), PSTR("PSD: sequence received: %lld"), ps16dz_seq);
+          snprintf_P(log_data, sizeof(log_data), PSTR("PSD: sequence received: %0ld"), ps16dz_seq/1000000L, ps16dz_seq%1000000L);
           AddLog(LOG_LEVEL_DEBUG);
         }