Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r9d7ad180a18e29ba08bf65228d61b6179ddbfcca -r521a0569bf3097e9f7075d9c0e99dca9af3e6410
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9d7ad180a18e29ba08bf65228d61b6179ddbfcca)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 521a0569bf3097e9f7075d9c0e99dca9af3e6410)
@@ -169,7 +169,7 @@
  * Dialysis may be resumed later.
  * @details
  * Inputs : none
- * Outputs : Blood and dialysate pumps stopped.  Heparing pump stopped.
+ * Outputs : Blood and dialysate pumps stopped.  Heparin pump stopped.
  * @return none
  *************************************************************************/
 void stopDialysis( void )
@@ -216,9 +216,11 @@
 BOOL pauseUF( void )
 {
     BOOL result = FALSE;
+    TREATMENT_STATE_T trtState = getTreatmentState();
     OP_MODE currMode = getCurrentOperationMode();
 
-    if ( ( MODE_TREA == currMode ) && ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_RUNNING_STATE == currentUFState ) )
+    if ( ( MODE_TREA == currMode ) && ( TREATMENT_DIALYSIS_STATE == trtState ) &&
+         ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_RUNNING_STATE == currentUFState ) )
     {
         // set outlet pump to dialysate rate
         result = setDialOutPumpTargetRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
@@ -244,8 +246,9 @@
 BOOL resumeUF( void )
 {
     BOOL result = FALSE;
+    OP_MODE currMode = getCurrentOperationMode();
 
-    if ( ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_PAUSED_STATE == currentUFState ) )
+    if ( ( MODE_TREA == currMode ) && ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_PAUSED_STATE == currentUFState ) )
     {
         S32 inletPumpRate = getTargetDialInFlowRate();