diff --git a/main/control.c b/main/control.c
index cf62ec3..9a81a65 100644
--- a/main/control.c
+++ b/main/control.c
@@ -98,7 +98,7 @@ void taskControl(void *pvParameters)
 
         if (bHeatingInAction == true)
         {
-            if (getChamberTemperature().fCurrentValue >= currentControlEntry.fChamberTemperature)
+            if ((getChamberTemperature().fCurrentValue >= currentControlEntry.fChamberTemperature) || (getChamberTemperature().predict60s.fValue >= currentControlEntry.fChamberTemperature))
             {
                 ESP_LOGI(TAG, "Chamber Target Temperature reached: Disable burner");
                 bHeatingInAction = false;
diff --git a/main/inputs.c b/main/inputs.c
index d9eb47f..8d99540 100644
--- a/main/inputs.c
+++ b/main/inputs.c
@@ -17,9 +17,9 @@ const uint8_t uBurnerFaultPin = 19U;
 const uint8_t uDS18B20Pin = 4U;
 
 const onewire_addr_t uChamperTempSensorAddr = 0x3e0000001754be28;
-const onewire_addr_t uOutdoorTempSensorAddr = 0x880000001648e328;
+const onewire_addr_t uOutdoorTempSensorAddr = 0x78000000c6c2f728;
 const onewire_addr_t uInletFlowTempSensorAddr = 0xe59cdef51e64ff28;
-const onewire_addr_t uReturnFlowTempSensorAddr = 0xa7a8e1531f64ff28;
+const onewire_addr_t uReturnFlowTempSensorAddr = 0x880000001648e328;
 
 onewire_addr_t uOneWireAddresses[MAX_DN18B20_SENSORS];
 float fDS18B20Temps[MAX_DN18B20_SENSORS];