diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 0ec3f81c0..762e10d1f 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
index 9d52ea724..49fd230fe 100644
--- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
@@ -1332,8 +1332,8 @@ void setVchip(int val) {
 int getVChipToSet(enum DACINDEX ind, int val) {
     LOG(logDEBUG1, ("Calculating vchip to set\n"));
     // validate index & get adc index
-    int adcIndex = getADCIndexFromDACIndex(ind);
-    if (adcIndex == -1) {
+    int pwrIndex = getADCIndexFromDACIndex(ind);
+    if (pwrIndex == -1) {
         return -1;
     }
 
@@ -1346,14 +1346,14 @@ int getVChipToSet(enum DACINDEX ind, int val) {
         // get the dac values for each adc
         char emsg[MAX_STR_LENGTH];
         int dacmV = -1;
-        if (getPower(ipwr, &dacmV, emsg) == FAIL) {
+        if (getPower(ind, &dacmV, emsg) == FAIL) {
             LOG(logERROR, ("Could not get power %d to calculate vchip. %s\n",
                            ipwr, emsg));
             return -1;
         }
 
         // if current index, replace with value to be set
-        if (ipwr == adcIndex) {
+        if (ipwr == pwrIndex) {
             dacmV = val;
         }
 
@@ -1470,19 +1470,8 @@ int getPowerEnable(int pwrIndex) {
     return (bus_r(POWER_REG) & mask);
 }
 
-int isPowerValid(enum DACINDEX ind, int val, char *mess) {
+int isPowerValid(int pwrIndex, int val, char *mess) {
     char *powerNames[] = {PWR_NAMES};
-
-    // validate & get power index
-    int pwrIndex = getADCIndexFromDACIndex(ind);
-    if (pwrIndex == -1) {
-        snprintf(mess, MAX_STR_LENGTH,
-                 "Could not validate power. Invalid DAC index: %d for Power\n",
-                 ind);
-        LOG(logERROR, (mess));
-        return FAIL;
-    }
-
     // check vlimit
     if (checkVLimitCompliant(val) == FAIL) {
         snprintf(mess, MAX_STR_LENGTH,
@@ -1581,7 +1570,7 @@ int setPower(enum DACINDEX ind, int val, char *mess) {
         return FAIL;
     }
 
-    if (isPowerValid(ind, val, mess) == FAIL) {
+    if (isPowerValid(pwrIndex, val, mess) == FAIL) {
         return FAIL;
     }
 
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index 9ff6d5fa9..22d4db562 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index bdcdb373f..ace499d1b 100755
Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
index dc962da2b..ccc82c7ef 100755
Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ
diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
index 0f4186a8d..1629d8ec2 100644
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
+++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
@@ -387,7 +387,7 @@ int voltageToDac_PowerRegulators(int pwrIndex, int voltage, int *retval,
                                  char *mess);
 void powerEnable(int on, int pwrIndex);
 int getPowerEnable(int pwrIndex);
-int isPowerValid(enum DACINDEX ind, int val, char *mess);
+int isPowerValid(int pwrIndex, int val, char *mess);
 int getPower(enum DACINDEX ind, int *retval, char *mess);
 int setPower(enum DACINDEX ind, int val, char *mess);
 
diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
index 78bc7052b..a306b0ba5 100755
Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
index 92b4bdfb4..b7acce53d 100644
--- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
@@ -1323,19 +1323,9 @@ int getPowerEnable(int pwrIndex) {
     return (bus_r(CTRL_REG) & mask);
 }
 
-int isPowerValid(enum DACINDEX ind, int val, char *mess) {
+int isPowerValid(int pwrIndex, int val, char *mess) {
     char *powerNames[] = {PWR_NAMES};
 
-    // validate & get power index
-    int pwrIndex = getPwrIndex(ind);
-    if (pwrIndex == -1) {
-        snprintf(mess, MAX_STR_LENGTH,
-                 "Could not validate power. Invalid DAC index: %d for Power\n",
-                 ind);
-        LOG(logERROR, (mess));
-        return FAIL;
-    }
-
     // check vlimit
     if (checkVLimitCompliant(val) == FAIL) {
         snprintf(mess, MAX_STR_LENGTH,
@@ -1410,7 +1400,7 @@ int setPower(enum DACINDEX ind, int val, char *mess) {
         return FAIL;
     }
 
-    if (isPowerValid(ind, val, mess) == FAIL) {
+    if (isPowerValid(pwrIndex, val, mess) == FAIL) {
         return FAIL;
     }
 
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
index 57a0b279d..de2c2c372 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
@@ -1070,7 +1070,6 @@ TEST_CASE("v_abcd", "[.cmdcall]") {
                     if (det_type == defs::XILINX_CHIPTESTBOARD &&
                         prev_val[i] == -100) {
                         prev_val[i] = 0;
-                        continue;
                     }
                     det.setPower(indices[i], prev_val[i], {i});
                 }
diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index 3ca4b2b75..794cc6f60 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -3,10 +3,10 @@
 /** API versions */
 #define APILIB       "0.0.0 0x250909"
 #define APIRECEIVER  "0.0.0 0x250822"
-#define APICTB       "0.0.0 0x260115"
+#define APICTB       "0.0.0 0x260116"
 #define APIGOTTHARD2 "0.0.0 0x260114"
-#define APIMOENCH    "0.0.0 0x250909"
-#define APIEIGER     "0.0.0 0x250909"
-#define APIXILINXCTB "0.0.0 0x260115"
-#define APIJUNGFRAU  "0.0.0 0x250909"
+#define APIMOENCH    "0.0.0 0x260107"
+#define APIEIGER     "0.0.0 0x260107"
+#define APIXILINXCTB "0.0.0 0x260116"
+#define APIJUNGFRAU  "0.0.0 0x260107"
 #define APIMYTHEN3   "0.0.0 0x260114"