Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c -r563f516a81cb41290008f93b33e7cf5e121717db
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 563f516a81cb41290008f93b33e7cf5e121717db)
@@ -94,9 +94,19 @@
  *************************************************************************/
 void initAirTrap( void )
 {
+    U32 i;
+
     resetAirTrap();
     airTrapSelfTestState = AIR_TRAP_SELF_TEST_STATE_START;
     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;
+    }
 }
 
 /*********************************************************************//**
@@ -217,7 +227,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
         }