diff --git a/metrics.py b/metrics.py
index 3f68c15..58b8176 100644
--- a/metrics.py
+++ b/metrics.py
@@ -53,11 +53,15 @@ class TasmotaCollector(object):
                 label = string_values[i].split("{m}")[0]
                 value = string_values[i].split("{m}")[1].split("{e}")[0]
                 if "<td" in value:
-                    value = value.replace("</td><td style='text-align:left'>", "").split("</td>")[0]
+                    value = value.replace("</td><td style='text-align:left'>", "")
+                    value = value.replace("</td><td>&nbsp;</td><td>", "")
 
                 values[label] = value
             except IndexError:
+                print("Index Error")
                 continue
+            print(label)
+            print(value)
         return values
 
 def signal_handler(signal, frame):