Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08 -rc012c285070a62a76c1be7cf7fc159d1f17fd3ad
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c012c285070a62a76c1be7cf7fc159d1f17fd3ad)
@@ -95,7 +95,7 @@
     pendingStartDGChemicalDisinfectRequest = FALSE;
 
     // Reset the heaters efficiency for another treatment
-    resetHeatersEfficiency();
+    resetHeatersEstimationGain();
 
     // Initialize the reservoirs parameters for another treatment.
     // This is to make sure the boolean flag for the first fill is set to TRUE.
@@ -230,7 +230,7 @@
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }
 
-    if ( FILTER_FLUSH_DATA_PUBLISH_INTERVAL <= filterFlushPublishTimerCounter++ )
+    if ( ++filterFlushPublishTimerCounter >= FILTER_FLUSH_DATA_PUBLISH_INTERVAL )
     {
         STANDBY_MODE_DATA_T data;