diff --git a/Src/mmr_can_receive.c b/Src/mmr_can_receive.c
index c38f85c..a3639ff 100644
--- a/Src/mmr_can_receive.c
+++ b/Src/mmr_can_receive.c
@@ -17,7 +17,7 @@ typedef struct {
 
 static HalStatus receiveOne(ReceptionParams *rp);
 static HalStatus receiveAll(ReceptionParams *rp);
-static bool headerIsMultiFrame(MmrCanHeader *header, CanId targetId);
+static bool headerIsMultiFrame(MmrCanHeader header, CanId targetId);
 
 
 /**
@@ -77,7 +77,7 @@ static HalStatus receiveOne(ReceptionParams *rp) {
 }
 
 
-static always_inline bool headerIsMultiFrame(MmrCanHeader header, CanId targetId) {
+static bool headerIsMultiFrame(MmrCanHeader header, CanId targetId) {
   return
     MMR_CAN_IsMultiFrame(header) &&
     !MMR_CAN_IsMultiFrameEnd(header) &&
diff --git a/Src/mmr_can_scs_manager.c b/Src/mmr_can_scs_manager.c
index f577643..db3218c 100644
--- a/Src/mmr_can_scs_manager.c
+++ b/Src/mmr_can_scs_manager.c
@@ -61,8 +61,8 @@ HalStatus MMR_CAN_SendScs(
 HalStatus MMR_CAN_HandleNextScs(CanHandle *hcan) {
   static int counter = 0;
 
-  MmrCanScsEntry *entry = &__scsEntries[counter];
-  ++counter %= MMR_CAN_SCS_ENTRIES_COUNT;
+  MmrCanScsEntry *entry = &__scsEntries[counter++];
+  counter %= MMR_CAN_SCS_ENTRIES_COUNT;
 
   if (MMR_CAN_HeaderToBits(entry->header) == 0) {
     return HAL_OK;