Index: firmware/App/Monitors/Pressures.c
===================================================================
diff -u -r0f2921b5c227ee8fb52d8a9ae8b51e507550ea23 -r384157184f801e501c61bdf675d7d8b727b5ab9d
--- firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 0f2921b5c227ee8fb52d8a9ae8b51e507550ea23)
+++ firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 384157184f801e501c61bdf675d7d8b727b5ab9d)
@@ -423,16 +423,15 @@
     {
         filtArt = getFilteredArterialPressure();
         filtVen = getFilteredVenousPressure();
+        filtTmp = getTMPPressure();
     }
     else
     {
         filtArt = getLongFilteredArterialPressure();
         filtVen = getLongFilteredVenousPressure();
+        filtTmp = getLongFilteredTMPPressure();
     }
 
-    // Using final TMP value for override.
-    filtTmp = getLongFilteredTMPPressure();
-
     curArtPres = FLOAT_TO_INT_WITH_ROUND( filtArt );
     curVenPres = FLOAT_TO_INT_WITH_ROUND( filtVen );
     curTmpPres = FLOAT_TO_INT_WITH_ROUND( filtTmp );
@@ -497,8 +496,8 @@
     {
         // apply pressure windows when stable
         S32 artOffset    = (S32)getSysConfigTreatmentParameterU32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
-        S32 venMinOffset = (S32)getSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW );
-        S32 venMaxOffset = (S32)getSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW );
+        S32 venMinOffset = (S32)getSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW );
+        S32 venMaxOffset = (S32)getSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW );
         S32 tmpOffset    = (S32)getSysConfigTreatmentParameterU32( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW );
 
         currentArterialMinLimit = stableArterialPressure - artOffset;