Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r837d2d171723b094843ab0911a193a393dad583e
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 837d2d171723b094843ab0911a193a393dad583e)
@@ -391,7 +391,7 @@
 {
     BOOL result = FALSE;
 
-    if ( status < NUM_OF_BUBBLE_STATUS )
+    if ( status < NUM_OF_BUBBLE_STATUS && bubble < NUM_OF_BUBBLES )
     {
         if ( TRUE == isTestingActivated() )
         {