diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 13ec4fad8..e581f44c0 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -4904,15 +4904,15 @@ uint32_t multiSlsDetector::readRegister(uint32_t addr){
 }
 
 
-int multiSlsDetector::setBit(int addr, int n) {
-	int ret1, ret=-100;
+uint32_t multiSlsDetector::setBit(uint32_t addr, int n) {
+	uint32_t ret, ret1;
 
 	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			ret1=detectors[i]->setBit(addr,n);
 			if(detectors[i]->getErrorMask())
 				setErrorMask(getErrorMask()|(1<<i));
-			if (ret==-100)
+			if (i==0)
 				ret=ret1;
 			else if (ret!=ret1) {
 				// not setting it to -1 as it is a possible value
@@ -4926,15 +4926,15 @@ int multiSlsDetector::setBit(int addr, int n) {
 }
 
 
-int multiSlsDetector::clearBit(int addr, int n) {
-	int ret1, ret=-100;
+uint32_t multiSlsDetector::clearBit(uint32_t addr, int n) {
+	uint32_t ret, ret1;
 
 	for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
 		if (detectors[i]) {
 			ret1=detectors[i]->clearBit(addr,n);
 			if(detectors[i]->getErrorMask())
 				setErrorMask(getErrorMask()|(1<<i));
-			if (ret==-100)
+			if (i==0)
 				ret=ret1;
 			else if (ret!=ret1) {
 				// not setting it to -1 as it is a possible value
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index 72f8df6c4..a7acd3e6b 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -1082,7 +1082,7 @@ class multiSlsDetector  : public slsDetectorUtils {
 
       DO NOT USE!!! ONLY EXPERT USER!!!
   */
-  int setBit(int addr, int n);
+  uint32_t setBit(uint32_t addr, int n);
 
 
   /**
@@ -1093,7 +1093,7 @@ class multiSlsDetector  : public slsDetectorUtils {
 
       DO NOT USE!!! ONLY EXPERT USER!!!
   */
-  int clearBit(int addr, int n);
+  uint32_t clearBit(uint32_t addr, int n);
 
 
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 16ae3835e..b5f723252 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -2440,25 +2440,24 @@ uint32_t slsDetector::readRegister(uint32_t addr){
 }
 
 
-int slsDetector::setBit(int addr, int n) {
+uint32_t slsDetector::setBit(uint32_t addr, int n) {
 	if (n<0 || n>31) {
 		std::cout << "Bit number out of Range" << std:: endl;
 		setErrorMask((getErrorMask())|(REGISER_WRITE_READ));
 	}
 
 	// normal bit range
+	//TODO! (Erik) Check for errors! cannot use value since reg is 32bits
 	else {
-		int val = readRegister(addr);
-		if (val != -1) {
-			writeRegister(addr,val | 1<<n);
-		}
+		uint32_t val = readRegister(addr);
+		writeRegister(addr,val | 1<<n);
 	}
 
 	return readRegister(addr);
 }
 
 
-int slsDetector::clearBit(int addr, int n) {
+uint32_t slsDetector::clearBit(uint32_t addr, int n) {
 	if (n<0 || n>31) {
 		std::cout << "Bit number out of Range" << std:: endl;
 		setErrorMask((getErrorMask())|(REGISER_WRITE_READ));
@@ -2466,10 +2465,8 @@ int slsDetector::clearBit(int addr, int n) {
 
 	// normal bit range
 	else {
-		int val = readRegister(addr);
-		if (val != -1) {
-			writeRegister(addr,val & ~(1<<n));
-		}
+		uint32_t val = readRegister(addr);
+		writeRegister(addr,val & ~(1<<n));
 	}
 
 	return readRegister(addr);
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h
index bbd1078b9..5a9fbe813 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.h
+++ b/slsDetectorSoftware/slsDetector/slsDetector.h
@@ -892,7 +892,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
 
       DO NOT USE!!! ONLY EXPERT USER!!!
   */
-  int setBit(int addr, int n);
+  uint32_t setBit(uint32_t addr, int n);
 
 
   /**
@@ -903,7 +903,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
 
       DO NOT USE!!! ONLY EXPERT USER!!!
   */
-  int clearBit(int addr, int n);
+  uint32_t clearBit(uint32_t addr, int n);
 
   /**
      set dacs value
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h
index e905ce261..265c67722 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h
@@ -529,7 +529,7 @@ class slsDetectorUtils :  public slsDetectorActions, public postProcessing {
 
       DO NOT USE!!! ONLY EXPERT USER!!!
   */
-  virtual int setBit(int addr, int n)=0;
+  virtual uint32_t setBit(uint32_t addr, int n)=0;
 
 
   /**
@@ -540,7 +540,7 @@ class slsDetectorUtils :  public slsDetectorActions, public postProcessing {
 
       DO NOT USE!!! ONLY EXPERT USER!!!
   */
-  virtual int clearBit(int addr, int n)=0;
+  virtual uint32_t clearBit(uint32_t addr, int n)=0;
 
 
   /**