Index: SystemComm.c
===================================================================
diff -u -rcc8db062292cdcbdb29e4174af5976ccf150d0c0 -rbba21c74ec37fd5a4282dad5713bd43cf4d90155
--- SystemComm.c	(.../SystemComm.c)	(revision cc8db062292cdcbdb29e4174af5976ccf150d0c0)
+++ SystemComm.c	(.../SystemComm.c)	(revision bba21c74ec37fd5a4282dad5713bd43cf4d90155)
@@ -476,7 +476,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_