diff --git a/src/TTN/plain_decoder.js b/src/TTN/plain_decoder.js
index ec55dc2c..ca43a5e4 100644
--- a/src/TTN/plain_decoder.js
+++ b/src/TTN/plain_decoder.js
@@ -10,7 +10,7 @@ function Decoder(bytes, port) {
     if (bytes.length >= 2) {
     decoded.wifi = (bytes[i++] << 8) | bytes[i++];}
     
-    if (bytes.length >= 4) {
+    if (bytes.length === 4 || bytes.length > 15) {
     decoded.ble = (bytes[i++] << 8) | bytes[i++];}
 
     if (bytes.length > 4) {
@@ -60,7 +60,13 @@ function Decoder(bytes, port) {
     decoded.humidity = ((bytes[i++] << 8) | bytes[i++]);
     decoded.air = ((bytes[i++] << 8) | bytes[i++]);
   }
+  
+  if (port === 8) {
+    var i = 0;
+    if (bytes.length >= 2) {
+    decoded.battery = (bytes[i++] << 8) | bytes[i++];}
+  }
 
   return decoded;
 
-}
\ No newline at end of file
+}