Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rb87bac344f39b289e83d4794fba4e53cf3dac94a -r48063d4ace2df447fc43af9bf321ae207c54561f
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision b87bac344f39b289e83d4794fba4e53cf3dac94a)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 48063d4ace2df447fc43af9bf321ae207c54561f)
@@ -73,7 +73,6 @@
 
 static U32  presTreatmentTimeSecs;                              ///< Prescribed treatment time (in seconds).
 static F32  presUFVolumeL;                                      ///< Prescribed ultrafiltration volume (in L).
-static F32  presUFRateLHr;                                      ///< Prescribed ultrafiltration rate (in L/hr).
 static F32  presUFRateMlMin;                                    ///< Prescribed ultrafiltration rate (in mL/Min).
 
 static U32  treatmentTimeMS;                                    ///< Elapsed treatment time (in ms).
@@ -160,7 +159,6 @@
 
     presTreatmentTimeSecs = 0;
     presUFVolumeL = 0.0F;
-    presUFRateLHr = 0.0F;
     presUFRateMlMin = 0.0F;
 
     resetSignalFlags();
@@ -210,7 +208,6 @@
     // Set treatment parameters
     presTreatmentTimeSecs = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) * SEC_PER_MIN;
     presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
-    presUFRateLHr = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
     presUFRateMlMin = ( presUFVolumeL * (F32)ML_PER_LITER ) / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
     setDialysisDDParams( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFVolumeL, presUFRateMlMin );
     bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR;
@@ -952,7 +949,7 @@
         F32 minUFVol = 0.0F;  // TODO getUltrafiltrationReferenceVolume() + presUFRate;  // current UF volume + 1 min at current rate
         // Compute maximum UF volume (considering from adjustment of UF rate and time perspectives)
         F32 maxUFVol1 = minUFVol + ( (F32)( presTime - elapseTime ) * MAX_UF_RATE_ML_MIN );
-        F32 maxUFVol2 = ( presUFRateLHr > 0.0F ? minUFVol + ( (F32)( MAX_TREATMENT_TIME_MINUTES - elapseTime - 1 ) * presUFRateLHr ) : minUFVol );
+        F32 maxUFVol2 = ( presUFRateMlMin > 0.0F ? minUFVol + ( (F32)( MAX_TREATMENT_TIME_MINUTES - elapseTime - 1 ) * presUFRateMlMin ) : minUFVol );
         F32 maxUFVol = MAX( maxUFVol1, maxUFVol2 );
         // Set minimum dialysate flow rate
         U32 minDialRate = MIN_DIALYSATE_FLOW_RATE;
@@ -1140,7 +1137,9 @@
     if ( ++ultrafiltrationBroadcastTimerCtr >= ULTRAFILTRATION_DATA_PUB_INTERVAL )
     {
         UF_DATA_PAYLOAD_T data;
+        F32 presUFRateLHr = 0.0F;
 
+        presUFRateLHr           = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR );
         data.setUFVolumeL       = presUFVolumeL;
         data.tgtUFRateLHr       = presUFRateLHr;
         data.ufVolumeDeliveredL = getUltrafiltrationVolumeDrawn();