Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -re5d1d67106a93a6cd1b5692b586625d715732e2f -r44a100f8e5210a02c23b8fcc4527d8e96d577381
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
@@ -82,8 +82,18 @@
  *************************************************************************/
 void initAirTrap( void )
 {
+    U32 i;
+
     resetAirTrap();
     airTrapIllegalLevelSensorsCtr = 0;
+
+    for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
+    {
+        airTrapLevels[i].data = 0;
+        airTrapLevels[i].ovData = 0;
+        airTrapLevels[i].ovInitData = 0;
+        airTrapLevels[i].override = OVERRIDE_RESET;
+    }
 }
 
 /*********************************************************************//**
@@ -204,7 +214,7 @@
 
         if ( TRUE == didTimeout( fillStartTime, fillTimeoutMS ) )
         {
-#ifndef DISABLE_AIR_TRAP_LEVELING
+#ifndef DISABLE_AIR_TRAP_LEVELING_ALARM
             activateAlarmNoData( ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT );
 #endif
         }