diff --git a/HAA/HAA_Main/main/header.h b/HAA/HAA_Main/main/header.h
index 8c96be8c..2d434dc3 100644
--- a/HAA/HAA_Main/main/header.h
+++ b/HAA/HAA_Main/main/header.h
@@ -11,7 +11,7 @@
 #include "../../common/common_headers.h"
 
 // Version
-#define HAA_FIRMWARE_VERSION                "12.11.2"
+#define HAA_FIRMWARE_VERSION                "12.11.3"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
diff --git a/HAA/HAA_Main/main/main.c b/HAA/HAA_Main/main/main.c
index 12d925c6..9a407a77 100644
--- a/HAA/HAA_Main/main/main.c
+++ b/HAA/HAA_Main/main/main.c
@@ -7574,7 +7574,7 @@ void run_homekit_server() {
 }
 
 void printf_header() {
-    INFO("\nHome Accessory Architect "HAA_FIRMWARE_VERSION""HAA_FIRMWARE_BETA_REVISION"\n(c) 2018-2023 José A. Jiménez Campos\n");
+    INFO("\nHome Accessory Architect "HAA_FIRMWARE_VERSION""HAA_FIRMWARE_BETA_REVISION"\n(c) 2018-2024 José A. Jiménez Campos\n");
     
 #ifdef HAA_DEBUG
     INFO("HAA DEBUG ENABLED\n");
diff --git a/libs/homekit-rsf/src/tlv.c b/libs/homekit-rsf/src/tlv.c
index 4a036dbc..90bcef1f 100644
--- a/libs/homekit-rsf/src/tlv.c
+++ b/libs/homekit-rsf/src/tlv.c
@@ -140,7 +140,11 @@ int tlv_format(const tlv_values_t *values, byte *buffer, size_t *size) {
     size_t required_size = 0;
     tlv_t *t = values->head;
     while (t) {
-        required_size += t->size + 2 * ((t->size + 254) / 255);
+        if (t->size > 0) {
+            required_size += t->size + 2 * ((t->size + 254) / 255);
+        } else {
+            required_size += 2;
+        }
         t = t->next;
     }