diff --git a/src/hm/Communication.h b/src/hm/Communication.h
index 4043f610..31f2214a 100644
--- a/src/hm/Communication.h
+++ b/src/hm/Communication.h
@@ -647,13 +647,12 @@ class Communication : public CommQueue<> {
             if(q->isDevControl)
                 keep = !crcPass;
 
+            q->iv->mGotFragment = false;
+            q->iv->mGotLastMsg  = false;
+            q->iv->miMultiParts = 0;
+
             if(keep)
                 cmdReset(q); // q will be zero'ed after that command
-            else {
-                q->iv->mGotFragment = false;
-                q->iv->mGotLastMsg  = false;
-                q->iv->miMultiParts = 0;
-            }
 
             mIsRetransmit       = false;
             mCompleteRetry      = false;