Index: firmware/App/Modes/StateTxPaused.c
===================================================================
diff -u -r0b025cea0b0f290ea44714a8fae6d71ea05088b9 -r4ea39ac34ede5011de1954b7c58761df25120fcf
--- firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 0b025cea0b0f290ea44714a8fae6d71ea05088b9)
+++ firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 4ea39ac34ede5011de1954b7c58761df25120fcf)
@@ -29,6 +29,7 @@
 #include "StateTxPaused.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TubeSetInstall.h"
 #include "TxParams.h"
 #include "Valves.h"
 #include "Valve3Way.h"
@@ -351,13 +352,10 @@
 static BOOL isFluidBolusPermitted( void )
 {
     BOOL result = FALSE;
-    BOOL isDialysateGoodToDeliver = TRUE;     // TODO: replace TRUE with getDialysateGoodToDeliverStatus() when we are ready
 
-    //TODO: Uncomment and remove the modality when tube set type logic is implemented
-    //if ( ( TUBE_SET_TYPE_HDF == getTubeSetType() )
-    if ( TREATMENT_MODALITY_HDF == getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_MODALITY ) )
+    if ( TUBE_SET_TYPE_HDF == getTubeSetType() )
     {
-        result = ( TRUE == isDialysateGoodToDeliver ) ? TRUE : FALSE;
+        result = ( TRUE == getDialysateGoodToDeliverStatus() ) ? TRUE : FALSE;
     }
     else
     {