Index: SystemComm.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -rfc0b755338e1ccd0cabe1965daf4ce2bd78c92e7
--- SystemComm.c	(.../SystemComm.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ SystemComm.c	(.../SystemComm.c)	(revision fc0b755338e1ccd0cabe1965daf4ce2bd78c92e7)
@@ -434,7 +434,9 @@
                     memcpy( &(rcvMsg.msg.payload), dataPtr, rcvMsg.msg.hdr.payloadLen );
                     dataPtr += rcvMsg.msg.hdr.payloadLen;
                     // Copy CRC portion of message data to the new message
-                    rcvMsg.crc = *dataPtr;
+                    rcvMsg.crc = *dataPtr;
+                    // Set incoming buffer that message came into
+                    rcvMsg.msg.in_buffer = (COMM_BUFFER_T)i;
                     // Add new message to queue for later processing
                     addToMsgQueue( MSG_Q_IN, &rcvMsg );
 #ifdef _TD_