diff --git a/Inc/mmr_can_header.h b/Inc/mmr_can_header.h
index f7a1743..4bf9698 100644
--- a/Inc/mmr_can_header.h
+++ b/Inc/mmr_can_header.h
@@ -79,7 +79,7 @@ MmrCanHeader MMR_CAN_HeaderFromBits(uint32_t bits);
  * Tells wether the given header represents an SCS.
  */
 bool MMR_CAN_IsHeaderScs(MmrCanHeader header);
-bool MMR_CAN_IsMultiFrame(MmrCanHeader *header);
-bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader *header);
+bool MMR_CAN_IsMultiFrame(MmrCanHeader header);
+bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader header);
 
 #endif /* INC_MMR_CAN_HEADER_H_ */
diff --git a/Src/mmr_can_header.c b/Src/mmr_can_header.c
index 760f800..bf05a3e 100644
--- a/Src/mmr_can_header.c
+++ b/Src/mmr_can_header.c
@@ -26,10 +26,10 @@ bool MMR_CAN_IsHeaderScs(MmrCanHeader header) {
   return header.messageType == MMR_CAN_MESSAGE_TYPE_SCS;
 }
 
-bool MMR_CAN_IsMultiFrame(MmrCanHeader *header) {
-  return header->messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME;
+bool MMR_CAN_IsMultiFrame(MmrCanHeader header) {
+  return header.messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME;
 }
 
-bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader *header) {
-  return header->messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME_END;
+bool MMR_CAN_IsMultiFrameEnd(MmrCanHeader header) {
+  return header.messageType == MMR_CAN_MESSAGE_TYPE_MULTI_FRAME_END;
 }
diff --git a/Src/mmr_can_receive.c b/Src/mmr_can_receive.c
index 7f774c8..c38f85c 100644
--- a/Src/mmr_can_receive.c
+++ b/Src/mmr_can_receive.c
@@ -41,7 +41,7 @@ HalStatus MMR_CAN_Receive(CanHandle *hcan, MmrCanMessage *result) {
   }
 
   result->header = rp.headers.mmr;
-  if (MMR_CAN_IsMultiFrame(&rp.headers.mmr)) {
+  if (MMR_CAN_IsMultiFrame(rp.headers.mmr)) {
     status |= receiveAll(&rp);
   }
 
@@ -57,7 +57,7 @@ static HalStatus receiveAll(ReceptionParams *rp) {
     status |= receiveOne(rp);
   }
   while (
-    headerIsMultiFrame(&rp->headers.mmr, targetId) && status == HAL_OK
+    headerIsMultiFrame(rp->headers.mmr, targetId) && status == HAL_OK
   );
 
   return status;
@@ -77,9 +77,9 @@ static HalStatus receiveOne(ReceptionParams *rp) {
 }
 
 
-static always_inline bool headerIsMultiFrame(MmrCanHeader *header, CanId targetId) {
+static always_inline bool headerIsMultiFrame(MmrCanHeader header, CanId targetId) {
   return
     MMR_CAN_IsMultiFrame(header) &&
     !MMR_CAN_IsMultiFrameEnd(header) &&
-    header->senderId == targetId;
+    header.senderId == targetId;
 }