Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rf3d625e2593ced120c4a98b9ed7e28b132445642 -r0bb3fe3f34c02bd19c36aff2b98876e46a2ad177
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f3d625e2593ced120c4a98b9ed7e28b132445642)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 0bb3fe3f34c02bd19c36aff2b98876e46a2ad177)
@@ -466,8 +466,8 @@
         setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
         fillStartTime = getMSTimerCount();
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_FILL, STATE_OPEN, 0 );
-        result = AIR_TRAP_VALVE_OPEN_STATE;
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_AIR_TRAP_STATE_CHANGE, (U32)AIR_TRAP_VALVE_CLOSED_STATE, (U32)result )
+        result = AIR_TRAP_VALVE_OPEN_STATE;
     }
 
     return result;