Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r1d49abd3736a0e21a9ceb56e213d4337fbb8138c -r5195e227eaa5e39317e3869406dfbd7da3949fd3
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 1d49abd3736a0e21a9ceb56e213d4337fbb8138c)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 5195e227eaa5e39317e3869406dfbd7da3949fd3)
@@ -589,9 +589,8 @@
 
     if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_1 ) )
     {
-        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
 
-        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        if ( DG_RESERVOIR_1 == getDGActiveReservoir() )
         {
             U32 dialyzerDialysateVolume = getDialyzerDialysateVolume();
 
@@ -770,9 +769,7 @@
 
     if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_2 ) )
     {
-        cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-
-        if ( TRUE == hasDGCompletedReservoirSwitch() )
+        if ( DG_RESERVOIR_2 == getDGActiveReservoir() )
         {
             signalBloodPumpHardStop();
             setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );