diff --git a/src/app.cpp b/src/app.cpp
index 7ba18a8c..2454e9ea 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -120,7 +120,6 @@ void app::loop(void) {
     if (mNrfRadio.loop() && mConfig->nrf.enabled) {
         while (!mNrfRadio.mBufCtrl.empty()) {
             packet_t *p = &mNrfRadio.mBufCtrl.front();
-
             if (mConfig->serial.debug) {
                 DPRINT(DBG_INFO, F("RX "));
                 DBGPRINT(String(p->len));
@@ -135,10 +134,10 @@ void app::loop(void) {
 
             Inverter<> *iv = mSys.findInverter(&p->packet[1]);
             if (NULL != iv) {
-                if (IV_HM == iv->ivGen)
-                    mPayload.add(iv, p);
-                else
+                if (IV_MI == iv->ivGen)
                     mMiPayload.add(iv, p);
+                else
+                    mPayload.add(iv, p);
             }
             mNrfRadio.mBufCtrl.pop();
             yield();
diff --git a/src/defines.h b/src/defines.h
index 71766802..b7b53887 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       7
-#define VERSION_PATCH       60
+#define VERSION_PATCH       61
 
 //-------------------------------------
 typedef struct {
diff --git a/src/hm/hmSystem.h b/src/hm/hmSystem.h
index 6c6faef6..a8ca2371 100644
--- a/src/hm/hmSystem.h
+++ b/src/hm/hmSystem.h
@@ -69,10 +69,13 @@ class HmSystem {
             } else if(iv->config->serial.u64 != 0ULL) {
                 DPRINTLN(DBG_ERROR, F("inverter type can't be detected!"));
                 return;
-            }
+            } else
+                iv->ivGen = IV_UNKNOWN;
 
             iv->init();
             mNumInv ++;
+            if(IV_UNKNOWN == iv->ivGen)
+                return; // serial is 0
 
             DPRINT(DBG_INFO, "added inverter ");
             if(iv->config->serial.b[5] == 0x11) {