Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -rafe0d7c5e1ada7872125e04d62fe5602427ffa63 -r60b6eccce34be08891b83299ca12936534d56361
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision afe0d7c5e1ada7872125e04d62fe5602427ffa63)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 60b6eccce34be08891b83299ca12936534d56361)
@@ -19,6 +19,7 @@
 #include "Bubble.h"
 #include "FPGA.h"
 #include "OperationModes.h"
+#include "Switches.h"
 #include "SystemCommMessages.h"
 #include "TaskPriority.h"
 #include "Timers.h"
@@ -200,8 +201,8 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BUBBLE_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            // Check status reading and act upon
-            if ( BUBBLE_DETECTED == getBubbleStatus( bubble ) )
+            // Check status reading and act upon but the pump track switch must be closed
+            if ( ( BUBBLE_DETECTED == getBubbleStatus( bubble ) ) && ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ) )
             {
                 if ( getCurrentOperationMode() == MODE_TREA )
                 {
@@ -231,7 +232,7 @@
             }
         }
 
-        if ( TRUE == bubblesSelfTestRequested[ bubble ] )
+        if ( ( TRUE == bubblesSelfTestRequested[ bubble ] ) && ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ) )
         {
             state = BUBBLE_SELF_TEST_STATE;
             bubblesSelfTestRequested[ bubble ] = FALSE;