Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r1f3647830e9de0a1f0a4e445ce8d72d5525f51fb -r90f6438e80dbe0a32472a076a0d1bc54db65d15a
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 1f3647830e9de0a1f0a4e445ce8d72d5525f51fb)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 90f6438e80dbe0a32472a076a0d1bc54db65d15a)
@@ -87,16 +87,17 @@
 BOOL addToCommBuffer( COMM_BUFFER_T buffer, U08* data, U32 len )
 {
     BOOL result = FALSE;
-    U32  activeBuffer = activeDoubleBuffer[buffer];
 
     // verify given buffer
     if ( buffer < NUM_OF_COMM_BUFFERS )
     {
+        U32 activeBuffer;
         U32 currentActiveBufCount;  // where to start adding new data to buffer (after existing data)
 
         // add requires brief thread protection because there may be multiple sources for transmits trying to add data to a buffer.
         _disable_IRQ();
 
+        activeBuffer = activeDoubleBuffer[buffer];
         currentActiveBufCount = commBufferByteCount[buffer][activeBuffer];
 
         // check to make sure buffer is not too full to service this add