Index: App/Services/MsgQueues.c
===================================================================
diff -u -ra87b6b9e253c6c0fcc84bca6f5de71959ce18bcc -r1d856a336fbfdc72a1e1165b64f1725e497c5f65
--- App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision a87b6b9e253c6c0fcc84bca6f5de71959ce18bcc)
+++ App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 1d856a336fbfdc72a1e1165b64f1725e497c5f65)
@@ -83,7 +83,7 @@
             // add message to queue
             msgQueues[queue][msgQueueNexts[queue]] = *msg;
             // increment next index to add to
-            msgQueueNexts[queue] = INC_WRAP(msgQueueNexts[queue],0,MAX_MSG_QUEUE_SIZE);
+            msgQueueNexts[queue] = INC_WRAP(msgQueueNexts[queue],0,MAX_MSG_QUEUE_SIZE-1);
             // increment queue count
             msgQueueCounts[queue]++;
         }
@@ -125,7 +125,7 @@
             // get message from queue
             *msg = msgQueues[queue][msgQueueStarts[queue]];
             // increment queue next index to get from
-            msgQueueStarts[queue] = INC_WRAP(msgQueueStarts[queue],0,MAX_MSG_QUEUE_SIZE);
+            msgQueueStarts[queue] = INC_WRAP(msgQueueStarts[queue],0,MAX_MSG_QUEUE_SIZE-1);
             // decrement queue count
             msgQueueCounts[queue]--;
         }