diff --git a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0 b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0
index 57db3054e..91b3b7653 100755
Binary files a/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0 and b/slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0 differ
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 6a69c9b5a..5a2712e91 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -1438,7 +1438,7 @@ int* multiSlsDetector::getDataFromDetector() {
 #ifdef VERBOSE
 				cout << "Detector " << id << " does not have data left " << endl;
 #endif
-				if(detectors[id]->getDetectorsType() != EIGER)
+				if((detectors[id]->getDetectorsType() != EIGER)||(detectors[id]->getDetectorsType() != JUNGFRAU))
 					break;
 			}
 			p+=n/sizeof(int);
@@ -1447,6 +1447,7 @@ int* multiSlsDetector::getDataFromDetector() {
 
 	//eiger returns only null
 	detectorType types = getDetectorsType();
+	//if(types == EIGER )
 	if(types == EIGER || types == JUNGFRAU)
 		return NULL;
 
@@ -1454,9 +1455,9 @@ int* multiSlsDetector::getDataFromDetector() {
 		for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
 			if (id!=nodatadet) {
 				if (detectors[id]) {
-#ifdef VERBOSE
+//#ifdef VERBOSE
 					cout << "Stopping detector "<< id << endl;
-#endif
+//#endif
 					detectors[id]->stopAcquisition();
 					if(detectors[id]->getErrorMask())
 						setErrorMask(getErrorMask()|(1<<id));