diff --git a/Src/mmr_can_send.c b/Src/mmr_can_send.c
index 5e7a3a3..6c4d613 100644
--- a/Src/mmr_can_send.c
+++ b/Src/mmr_can_send.c
@@ -118,7 +118,10 @@ static HalStatus send(TransmissionParams *tp) {
 
 
 static CanMailbox *getNextMailbox() {
-  return &__mailboxes[__currentMailbox++ % MAILBOXES_COUNT];
+  __currentMailbox++;
+  __currentMailbox %= MAILBOXES_COUNT;
+
+  return __mailboxes + __currentMailbox;
 }