Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r70c1c1e3d39d9653c1e5ea0eaf6447cf812d24df -r088147dd07e3a57cf30f90eb15833c3e088e9d61
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 70c1c1e3d39d9653c1e5ea0eaf6447cf812d24df)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 088147dd07e3a57cf30f90eb15833c3e088e9d61)
@@ -369,6 +369,12 @@
     U32  qBx                = ( 0 == qB ? MIN_SET_BLOOD_FLOW_RATE : (U32)qB );
     U32  airPumpStopTime    = AIR_PUMP_ON_STOP_TIME_MIN_MS + ( ( qBx - MIN_SET_BLOOD_FLOW_RATE ) / 2 );
 
+    // This is 50 ms delay that was closed on the way out of the open state but it is here now so the VBV is opening first
+    if ( STATE_OPEN == getValveAirTrapStatus() )
+    {
+        setValveAirTrap( STATE_CLOSED );
+    }
+
     // Transition to manual valve control state when requested
     if ( TRUE == pendingStopAirTrapController )
     {
@@ -460,8 +466,6 @@
     // Transition to closed valve state when fluid detected at upper level
     else if ( AIR_TRAP_LEVEL_FLUID == getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
-        setValveAirTrap( STATE_CLOSED );
-
         if ( TRUE == isBloodPumpRunning() )
         {
             setValvePosition( VBV, VALVE_POSITION_B_OPEN );