Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r435f9880b9ed32660a1451c771454f9831d06509 -r91068f6a6f3e2adae502fcda49e901e5ed752632
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 435f9880b9ed32660a1451c771454f9831d06509)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 91068f6a6f3e2adae502fcda49e901e5ed752632)
@@ -104,7 +104,6 @@
 
     resetAirTrap();
     airTrapDataPublicationTimerCounter      = DATA_PUBLISH_COUNTER_START_COUNT;
-    airTrapValveOpenAtStartOfTreatement     = TRUE;
     airPumpOnDelayStartTime                 = getMSTimerCount();
     stopAirPumpStartTime                    = 0;
 
@@ -135,9 +134,10 @@
  *************************************************************************/
 void resetAirTrap( void )
 {
-    airTrapControllerState = AIR_TRAP_INIT_STATE;
-    pendingStartAirTrapController = FALSE;
-    pendingStopAirTrapController = FALSE;
+    airTrapControllerState               = AIR_TRAP_INIT_STATE;
+    pendingStartAirTrapController        = FALSE;
+    pendingStopAirTrapController         = FALSE;
+    airTrapValveOpenAtStartOfTreatement  = TRUE;
 }
 
 /*********************************************************************//**
@@ -411,7 +411,6 @@
               ( ( TRUE == didTimeout( stopAirPumpStartTime, airPumpStopTime ) ) ||
                 ( ( AIR_TRAP_LEVEL_AIR   == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) &&
                   ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) ) ) )
-
     {
         setAirPumpState( AIR_PUMP_STATE_OFF );
         airPumpOnDelayStartTime = getMSTimerCount();