diff --git a/IR_Decoder.h b/IR_Decoder.h
index 62e1bda..88fb836 100644
--- a/IR_Decoder.h
+++ b/IR_Decoder.h
@@ -27,7 +27,6 @@ public:
             #ifdef IRDEBUG_INFO
             Serial.println("PARSING RAW DATA");
             #endif
-            gotRaw.set(&packInfo, id);
             isWaitingAcceptSend = false;
             switch (packInfo.buffer[0] >> 5 & IR_MASK_MSG_TYPE) {
                 case IR_MSG_DATA_ACCEPT:
@@ -54,6 +53,7 @@ public:
                 acceptCustomByte = crc8(gotData.getDataPrt(), 0, gotData.getDataSize(), poly1);
                 if (addrAcceptSendTo && addrAcceptSendTo < IR_Broadcast) isWaitingAcceptSend = true;
             }
+            gotRaw.set(&packInfo, id);
         }
         if (isWaitingAcceptSend && millis() - acceptSendTimer > 75) {
             encoder->sendAccept(addrAcceptSendTo, acceptCustomByte);
diff --git a/PacketTypes.h b/PacketTypes.h
index c2fe54a..f9935d4 100644
--- a/PacketTypes.h
+++ b/PacketTypes.h
@@ -23,7 +23,7 @@ namespace PacketTypes {
             this->packInfo = packInfo;
             this->id = id;
 
-            if (isAvailable = checkAddress()) {
+            if (checkAddress()) {
                 isAvailable = true;
                 isRawAvailable = true;
                 #ifdef IRDEBUG_INFO