diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 847f46b67..f75b801de 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index ac05ee43e..011b76d33 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index dcb12c6b1..cad583e4a 100755
Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ
diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index d0b1d5dd5..c1b8deb8c 100755
Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index f454bc7a9..006f0db48 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 61f0dc249..a3fd01de0 100755
Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ
diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
index c825345e4..5f3dbbde7 100644
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@@ -5454,16 +5454,14 @@ int set_num_interfaces(int file_des) {
                         }
                         // if still 0, copy from entry 0
                         if (iRxEntry != 0) {
-                            if (udpDetails[iRxEntry].srcip2 == 0) {
-                                udpDetails[iRxEntry].srcip2 = udpDetails[0].srcip2;
-                            }
+                            udpDetails[iRxEntry].srcip2 = udpDetails[0].srcip2;
+                            udpDetails[iRxEntry].srcmac2 = udpDetails[0].srcmac2;
                             if (udpDetails[iRxEntry].dstip2 == 0) {
                                 udpDetails[iRxEntry].dstip2 = udpDetails[0].dstip2;
                             }
                             if (udpDetails[iRxEntry].dstmac2 == 0) {
                                 udpDetails[iRxEntry].dstmac2 = udpDetails[0].dstmac2;
                             }
-                            // srcmac2 will be set in configure_mac
                         }
                     }
                 }
@@ -9162,19 +9160,6 @@ int set_dest_udp_list(int file_des) {
 #endif
         else {
             if (check_detector_idle("set udp destination list entries") == OK) {
-                udpDetails[entry].srcport = 0;
-                udpDetails[entry].srcip = 0;
-                udpDetails[entry].srcmac = 0;
-                udpDetails[entry].dstport = 0;
-                udpDetails[entry].dstip = 0;
-                udpDetails[entry].dstmac = 0;
-                udpDetails[entry].srcport2 = 0;
-                udpDetails[entry].srcip2 = 0;
-                udpDetails[entry].srcmac2 = 0;
-                udpDetails[entry].dstport2 = 0;
-                udpDetails[entry].dstip2 = 0;
-                udpDetails[entry].dstmac2 = 0;
-
                 if (args[1] != 0) {
                     udpDetails[entry].dstport = args[1];
                 }
@@ -9211,9 +9196,8 @@ int set_dest_udp_list(int file_des) {
                 }
                 // if still 0, copy from entry 0
                 if (entry != 0) {
-                    if (udpDetails[entry].srcip == 0) {
-                        udpDetails[entry].srcip = udpDetails[0].srcip;
-                    }
+                    udpDetails[entry].srcip = udpDetails[0].srcip;
+                    udpDetails[entry].srcmac = udpDetails[0].srcmac;
                     if (udpDetails[entry].dstip == 0) {
                         udpDetails[entry].dstip = udpDetails[0].dstip;
                     }
@@ -9221,9 +9205,8 @@ int set_dest_udp_list(int file_des) {
                         udpDetails[entry].dstmac = udpDetails[0].dstmac;
                     }
                     if (twoInterfaces) {
-                        if (udpDetails[entry].srcip2 == 0) {
-                            udpDetails[entry].srcip2 = udpDetails[0].srcip2;
-                        }
+                        udpDetails[entry].srcip2 = udpDetails[0].srcip2;
+                        udpDetails[entry].srcmac2 = udpDetails[0].srcmac2;
                         if (udpDetails[entry].dstip2 == 0) {
                             udpDetails[entry].dstip2 = udpDetails[0].dstip2;
                         }
@@ -9231,7 +9214,6 @@ int set_dest_udp_list(int file_des) {
                             udpDetails[entry].dstmac2 = udpDetails[0].dstmac2;
                         }
                     }
-                    // srcmac and srcmac2 will be set in configure_mac
                 }
                 configure_mac();
             }
diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index 59f49c6a4..eacb9b565 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -6,10 +6,10 @@
 
 
 
-#define APIEIGER 0x210827
 #define APICTB 0x210827
 #define APIGOTTHARD 0x210827
 #define APIGOTTHARD2 0x210827
 #define APIJUNGFRAU 0x210827
 #define APIMYTHEN3 0x210827
-#define APIMOENCH 0x210826
+#define APIMOENCH 0x210827
+#define APIEIGER 0x210827