Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra3960210792d0811093a6913e505d43eda1918ea -r8a553b10a224c745cb4bd6d963c867391905ba8c
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a3960210792d0811093a6913e505d43eda1918ea)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8a553b10a224c745cb4bd6d963c867391905ba8c)
@@ -130,16 +130,14 @@
     concentratePumpPrimeCount  = 0;
 
     // Get the heaters info form the NV data management
-    DG_HEATERS_RECORD_T heaterInfo       = getHeatersInfoReocrd();
+    /*DG_HEATERS_RECORD_T heaterInfo       = getHeatersInfoReocrd();
     // If the data in the NV data management was not initialized properly, set it to 0 otherwise, set the average flow rate
     fillStatus.fillFlowRateAverage       = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
     fillStatus.fillFlowRateRunningSum    = 0.0;
     fillStatus.fillSampleCounter         = 0;
     fillStatus.fillTemperatureRunningSum = 0.0;
     fillStatus.fillTemperatureAverage    = 0.0;
-    // The last fill temperature is initialized to TPo because this value is used for heater calculations prior to filling the
-    // reservoirs. The first actual value will be updated at the end of the fill cycle.
-    fillStatus.fillLastTemperature       = getTemperatureValue( (U32)TEMPSENSORS_INLET_PRIMARY_HEATER );
+    fillStatus.fillLastTemperature       = 0.0;*/ // TODO take this out of here. This only should be initialized once at the beginning of the treatment
 
     initPersistentAlarm( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
     initPersistentAlarm( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
@@ -173,6 +171,7 @@
 #ifndef DISABLE_FLOW_CONTROL_TREATMENT
     setROPumpTargetFlowRateLPM( getTargetFillFlowRateLPM(), TARGET_RO_PRESSURE_PSI );
 #endif
+    setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
     return fillState;