Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r3836fcf6e190a4b6609e31041310eda0dd6e35ee -r18541445702eb8c97b235d17c93c01d956c88dd1
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 3836fcf6e190a4b6609e31041310eda0dd6e35ee)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 18541445702eb8c97b235d17c93c01d956c88dd1)
@@ -242,7 +242,10 @@
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-#if 0
+
+#if !defined(_DEBUG_) && !defined (_RELEASE_) && !defined (_VECTORCAST_)
+    // Compile this part of code only if it is not debug, release, or VectorCAST. This is to make sure this part of code is not compiled
+    // and instrumented in VectorCAST
     // Reset the state machine
     // Note: the substate timers, and operation flags need to be reset on recovery, consider
     //       reinitializing the state variables, the resetting the state, by calling setModeFillStateTransition()
@@ -307,6 +310,7 @@
         }
     }
 #endif
+
     getFillChemicalCondRecord( &chemicalsCond );
     turnOnUVReactor( INLET_UV_REACTOR );
     turnOnUVReactor( OUTLET_UV_REACTOR );