diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 569b679a2..a87246b01 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -262,7 +262,7 @@ int cleanFifo(){
 	}
 	reg=bus_r(addr);
 #ifdef DDEBUG
-	printf("\nADC SYNC reg:%d\n",reg);
+	printf("\nADC SYNC reg:%x\n",reg);
 #endif
 	return OK;
 }
@@ -1177,8 +1177,12 @@ int initConfGain(int isettings,int val,int imod){
 
 
 int configureMAC(int ipad,long long int macad,long long int detectormacad, int detipad, int ival, int adc,int udpport){
-	//setting daqregister
-	setDAQRegister(adc);
+
+	if(runBusy())
+		if(stopStateMachine()==FAIL)
+			return FAIL;
+
+
 	//setting adc mask
 	int reg;
 	int udpPacketSize=0x050E;
@@ -1209,6 +1213,9 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
 	}
 
 
+	//setting daqregister
+	setDAQRegister(adc);
+
 #ifdef DDEBUG
 	printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
 	printf("IP Packet Size:%d\n",ipPacketSize);
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index 0e1b245be..d3b33c71f 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -2600,8 +2600,11 @@ int configure_mac(int file_des) {
   printf("Configuring MAC of module %d and adc %d at port %x\n", imod, adc,udpport);
 //#endif
 #ifdef MCB_FUNCS
-  if (ret==OK)
-    configureMAC(ipad,imacadd,idetectormacadd,detipad,digitalTestBit,adc,udpport);
+  if (ret==OK){
+    ret=configureMAC(ipad,imacadd,idetectormacadd,detipad,digitalTestBit,adc,udpport);
+    if(ret==FAIL)
+    	strcpy(mess,"could not stop detector acquisition to configure mac");
+  }
 #endif
   if (ret==FAIL)
     printf("configuring MAC of mod %d failed\n", imod);