diff --git a/Configuration/ZT.cfg b/Configuration/ZT.cfg
index 109c9b0..8de50fe 100644
--- a/Configuration/ZT.cfg
+++ b/Configuration/ZT.cfg
@@ -49,7 +49,7 @@ SONDE_LASER_EXT_1=ttyS0
 #avec la CC
 UTILISER_MODBUS_CC=OUI
 #Adresse modbus de la ZT
-MODBUS_CC_DEVID=9
+MODBUS_CC_DEVID=1
 #Port Modbus/TCP
 MODBUS_CC_PORT=2182
 
diff --git a/ZT b/ZT
index acfaad1..43bbf7d 100755
Binary files a/ZT and b/ZT differ
diff --git a/sources/Modbus/ModbusBackend.cpp b/sources/Modbus/ModbusBackend.cpp
index afd7bf5..08d17bd 100644
--- a/sources/Modbus/ModbusBackend.cpp
+++ b/sources/Modbus/ModbusBackend.cpp
@@ -233,8 +233,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
             //Write register data
             mModbusRepo->WriteHRData(StartAdress,NbRegisters,data);
 
-            qDebug("Slave Rx Write Multiple Registers.  Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
-            qDebug("Data: %s",data.toHex().data());
+            qDebug("\nSlave Rx Write Multiple Registers.  Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
+            qDebug("Data: %s\n",data.toHex().data());
 
             data = Transaction.mPDU.mData.left(4);   //The response corresponds to the Start Adress and Nb of Regs.  Which is the first 4 bytes of the initial request.
             SendModbusResponse(Transaction, data);
diff --git a/sources/Modbus/ModbusCCDefs.h b/sources/Modbus/ModbusCCDefs.h
index c484b62..0514af3 100644
--- a/sources/Modbus/ModbusCCDefs.h
+++ b/sources/Modbus/ModbusCCDefs.h
@@ -42,6 +42,9 @@
 #define ZT2_V02_ALARM_FLAG_MASK   0x0004
 #define ZT2_PEQ2_ALARM_FLAG_MASK  0x0008
 
+//Flags definitions for HR2027
+#define ZT_WATCHDOG_ON_VALUE      0x8000
+#define ZT_WATCHDOG_OFF_VALUE     0x0000
 
 
 //Register addressing
diff --git a/sources/Modbus/ModbusCCMgr.cpp b/sources/Modbus/ModbusCCMgr.cpp
index bfa9cea..ef81311 100644
--- a/sources/Modbus/ModbusCCMgr.cpp
+++ b/sources/Modbus/ModbusCCMgr.cpp
@@ -184,15 +184,17 @@ void CModbusCCMgr::ModbusCCWatchdogTimeout()
 
 void CModbusCCMgr::ModbusZTWatchdogTimeout()
 {
-    qint16 WD = mZTWatchdog;
+
+    quint16 WD = mZTWatchdog;
+  //  qDebug("WD = 0x%x",WD);
     mModbusRepo->WriteSingleReg(MODBUS_ZT_WATCHDOG_REG_ADD,WD);
-    if(mZTWatchdog == 1)
+    if(mZTWatchdog == ZT_WATCHDOG_ON_VALUE)
     {
-        mZTWatchdog = 0;
+        mZTWatchdog = ZT_WATCHDOG_OFF_VALUE;
     }
     else
     {
-        mZTWatchdog = 1;
+        mZTWatchdog = ZT_WATCHDOG_ON_VALUE;
     }
 }
 
diff --git a/sources/Modbus/ModbusCCMgr.h b/sources/Modbus/ModbusCCMgr.h
index 6aac0d2..7cb890b 100644
--- a/sources/Modbus/ModbusCCMgr.h
+++ b/sources/Modbus/ModbusCCMgr.h
@@ -54,7 +54,7 @@ private:
     QTcpServer *mModbusServer;
     int mModbusPort;
     QTimer *mZTWatchdogTimer, *mCCWatchdogTimer;
-    qint16 mZTWatchdog;
+    quint16 mZTWatchdog;
     qint16 mCCWatchdogState;
     bool mCCLinkState;
     QDateTime *mLastDateTime;
diff --git a/sources/Simulator/SimulationScenario.cpp b/sources/Simulator/SimulationScenario.cpp
index bb69d8f..3ca1879 100644
--- a/sources/Simulator/SimulationScenario.cpp
+++ b/sources/Simulator/SimulationScenario.cpp
@@ -154,7 +154,7 @@ unsigned int CSimulationScenario::CreateScenario()
             InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0);
             InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0);
 //V00 DETECTION
-//            if(bogie != 9)
+            if(bogie != 9)
             {
                 InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY);
             }