Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r4b528a5706b6d1c8661b00dcd45c39cf8db9a0f6 -red367cb6b1490e079043239d277a29a2f4747ed7
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4b528a5706b6d1c8661b00dcd45c39cf8db9a0f6)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision ed367cb6b1490e079043239d277a29a2f4747ed7)
@@ -63,8 +63,8 @@
 
 #define CONC_PUMPS_PRIME_AT_MAX_SPEED_TIME_OUT_MS       ( 7 * MS_PER_SECOND )                                ///< Concentrate pumps prime at maximum speed timeout in milliseconds.
 #define CONC_PUMPS_PRIME_CHECK_COND_SNSRS_TIME_OUT_MS   ( 10 * MS_PER_SECOND )                               ///< Concentrate pumps prime check conductivity sensors timeout in milliseconds.
-#define CONC_PUMPS_PRIME_MAX_ALLOWED_PRIME_TIME_OUT_MS  ( 50 * MS_PER_SECOND )                               ///< Concentrate pumps prime maximum allowed timeout in prime in milliseconds.
-#define NINTY_FIVE_PERCENT_FACTOR                       0.95F                                                ///< Ninety five percent of expected conductivity
+#define CONC_PUMPS_PRIME_MAX_ALLOWED_PRIME_TIME_OUT_MS  ( 60 * MS_PER_SECOND )                               ///< Concentrate pumps prime maximum allowed timeout in prime in milliseconds.
+#define HUNDRED_PERCENT_FACTOR                          1.00F                                                ///< Hundred percent of expected conductivity when first time reaches it.
 #define FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE          0.1F                                                 ///< Flow integrated volume has 10% tolerance compare to load cell reading.
 
 #define FIVE_PERCENT_FACTOR                             0.05F                                                ///< 5.0 / 100.0  used to calculate conductivity within range of -/+ 5%.
@@ -799,7 +799,7 @@
             F32 acidFillConduSPerCM   = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_NORMAL_OP ].acidConduSPerCM;
             F32 bicarbFillConduSPerCM = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_NORMAL_OP ].bicarbConduSPerCM;
 
-            if ( ( acidConduSPerCM >= ( acidFillConduSPerCM * NINTY_FIVE_PERCENT_FACTOR ) ) && ( bicarbConduSPerCM >= ( bicarbFillConduSPerCM * NINTY_FIVE_PERCENT_FACTOR ) ) )
+            if ( ( acidConduSPerCM >= ( acidFillConduSPerCM * HUNDRED_PERCENT_FACTOR ) ) && ( bicarbConduSPerCM >= ( bicarbFillConduSPerCM * HUNDRED_PERCENT_FACTOR ) ) )
             {
                 result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
                 setModeFillStateTransition( result );