diff --git a/src/EPMS/RPP/RPP_Cortex_TCP/State_Standby.cpp b/src/EPMS/RPP/RPP_Cortex_TCP/State_Standby.cpp
index dcefc39..f5f2792 100644
--- a/src/EPMS/RPP/RPP_Cortex_TCP/State_Standby.cpp
+++ b/src/EPMS/RPP/RPP_Cortex_TCP/State_Standby.cpp
@@ -84,10 +84,14 @@ StandbyState<ModbusIP>::StandbyState() {
     addStrategy("CB15_kW", new SingleValueStrategy(3.1F, 3.0f, 1000));
     addStrategy("CB16_kW", new SingleValueStrategy(3.1F, 3.0f, 1000));
 
-    addStrategy("MainCB_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
-    for (int i = 1; i <= 8; i++) {
-        addStrategy("CB" + std::to_string(i) + "_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
-    }
+    addStrategy("CB1_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB2_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB3_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB4_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB5_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB6_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB7_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
+    addStrategy("CB8_PF", new SingleValueStrategy(0.9F, 0.05f, 1000));
 }
 
 /**
diff --git a/src/EPMS/RPP/RPP_Cortex_TCP/config.h b/src/EPMS/RPP/RPP_Cortex_TCP/config.h
index 3de5778..7d2233b 100644
--- a/src/EPMS/RPP/RPP_Cortex_TCP/config.h
+++ b/src/EPMS/RPP/RPP_Cortex_TCP/config.h
@@ -193,7 +193,7 @@ modbusMap mb_map[] =
   {HR_FLOAT,  17352,   0,   "CB15_maxCurrent"},
   {HR_FLOAT,  17356,   0,   "CB16_maxCurrent"},
 
-  {HR_FLOAT,  64058,   0,   "MainCB_Total_kW"},
+  {HR_FLOAT,  63058,   0,   "MainCB_Total_kW"},
   {HR_FLOAT,  63178,   0,   "MainCB_maxCurrent"},
   {HR_FLOAT,  63068,   0,   "MainCB_neutralCurrent"},
   {HR_FLOAT,  63070,   0,   "MainCB_PF"},