Index: firmware/App/Modes/StateTxPaused.c
===================================================================
diff -u -r6b9b882169f108f9a5072dc60cdabbc1687aafcc -r83163b27c604072469c28623ba0e4ed9786e294a
--- firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 6b9b882169f108f9a5072dc60cdabbc1687aafcc)
+++ firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 83163b27c604072469c28623ba0e4ed9786e294a)
@@ -398,8 +398,8 @@
     TREATMENT_PAUSED_STATE_T result = state;
     BOOL bloodRecircBlocked         = isBloodRecircBlocked();
     BOOL dialysateRecircBlocked     = isDialysateRecircBlocked();
-    BOOL bldAlarmsStatus            = FALSE; //( ( TRUE == isAlarmActive( ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT ) ) &&
-                                             //  ( FALSE == isAlarmActive( ALARM_ID_HD_BLOOD_LEAK_DETECTED ) ? TRUE : FALSE ) ); // TODO un-comment when BLD is coming up
+    BOOL bldAlarmsStatus            = ( ( TRUE == isAlarmActive( ALARM_ID_DD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT ) ) &&
+                                        ( FALSE == isAlarmActive( ALARM_ID_DD_BLOOD_LEAK_DETECTED ) ? TRUE : FALSE ) );
 
     if ( TRUE == bldAlarmsStatus )
     {
@@ -422,27 +422,29 @@
             result = TREATMENT_PAUSED_FLUID_BOLUS_STATE;
         }
         // Both unblocked and not in recirculate both state
-        else if ( ( TREATMENT_PAUSED_NO_RECIRC_STATE != state ) && ( FALSE == dialysateRecircBlocked ) && ( FALSE == bloodRecircBlocked ) )
+        else if ( ( TREATMENT_PAUSED_NO_RECIRC_STATE != state ) && ( FALSE == dialysateRecircBlocked ) &&
+                  ( FALSE == bloodRecircBlocked ) && ( FALSE == isFluidBolusActive() ) )
         {
             result = TREATMENT_PAUSED_RECIRC_STATE;
             transitionToTxPausedState( result );
         }
         // Both blocked and not in stopped state
-        else if ( ( TREATMENT_PAUSED_NO_RECIRC_STATE != state ) && ( TRUE == dialysateRecircBlocked ) && ( TRUE == bloodRecircBlocked ) )
+        else if ( ( TREATMENT_PAUSED_NO_RECIRC_STATE != state ) && ( TRUE == dialysateRecircBlocked ) &&
+                  ( TRUE == bloodRecircBlocked ) && ( FALSE == isFluidBolusActive() ) )
         {
             result = TREATMENT_PAUSED_NO_RECIRC_STATE;
             transitionToTxPausedState( result );
         }
         // Dialysate recirculation blocked and not in blood recirc state
         else if ( ( TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE != state ) && ( TRUE == dialysateRecircBlocked ) &&
-                  ( FALSE == bloodRecircBlocked ) )
+                  ( FALSE == bloodRecircBlocked ) && ( FALSE == isFluidBolusActive() ) )
         {
             result = TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE;
             transitionToTxPausedState( result );
         }
         // Blood recirculation blocked and not in dialysate recirc state
         else if ( ( TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE != state ) && ( TRUE == bloodRecircBlocked ) &&
-                  ( FALSE == dialysateRecircBlocked ) )
+                  ( FALSE == dialysateRecircBlocked ) && ( FALSE == isFluidBolusActive() ) )
         {
             result = TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE;
             transitionToTxPausedState( result );