Added special condition for WaterReporter;