Index: SystemComm.c
===================================================================
diff -u -rbcc1ad9652142c462704a092ab3ac861ad161477 -rc3b603cc0e0ee1c98ca42ba73ceb9f6b3ba5f06f
--- SystemComm.c	(.../SystemComm.c)	(revision bcc1ad9652142c462704a092ab3ac861ad161477)
+++ SystemComm.c	(.../SystemComm.c)	(revision c3b603cc0e0ee1c98ca42ba73ceb9f6b3ba5f06f)
@@ -473,7 +473,7 @@
                     // Copy CRC portion of message data to the new message
                     rcvMsg.crc = *dataPtr;
                     // Set incoming buffer that message came into
-                    rcvMsg.msg.in_buffer = (COMM_BUFFER_T)i;
+                    rcvMsg.msg.in_buffer = getInBufferID( i );
                     // Add new message to queue for later processing
                     addToMsgQueue( MSG_Q_IN, &rcvMsg );
 #ifdef _TD_