Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rdce2b19d5f0efa09d0b3ad99358dacb2d43d76fc -r28b7042e4ec84be96d53795688530e348bdc6fb1
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision dce2b19d5f0efa09d0b3ad99358dacb2d43d76fc)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 28b7042e4ec84be96d53795688530e348bdc6fb1)
@@ -1028,7 +1028,8 @@
 
         // Always adjust UF volume to accommodate treatment time change (not UF rate)
         uFVolume = ( (F32)( treatmentTime - CALC_ELAPSED_TREAT_TIME_IN_MIN() ) * presUFRate ) + getUltrafiltrationReferenceVolume();
-        if ( ( treatmentTime <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
+        if ( ( treatmentTime >= getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
+             ( treatmentTime <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) &&
              ( uFVolume <= MAX_UF_VOLUME_ML ) )
         {
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -rdce2b19d5f0efa09d0b3ad99358dacb2d43d76fc -r28b7042e4ec84be96d53795688530e348bdc6fb1
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision dce2b19d5f0efa09d0b3ad99358dacb2d43d76fc)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 28b7042e4ec84be96d53795688530e348bdc6fb1)
@@ -517,7 +517,7 @@
         sendTreatmentParamsRangesToUI( treatmentParameters[ TREATMENT_PARAM_TREATMENT_DURATION ].minimum.uInt,
                                        treatmentParameters[ TREATMENT_PARAM_TREATMENT_DURATION ].maximum.uInt,
                                        0.0,
-                                       MIN( (F32)setTxDuration * MAX_UF_RATE_ML_MIN, MAX_UF_VOLUME_ML ),
+                                       MIN( (F32)setTxDuration * MAX_UF_RATE_ML_MIN, (F32)MAX_UF_VOLUME_ML ),
                                        treatmentParameters[ TREATMENT_PARAM_DIALYSATE_FLOW ].minimum.uInt,
                                        treatmentParameters[ TREATMENT_PARAM_DIALYSATE_FLOW ].maximum.uInt );
     }