diff --git a/src/DataVampire.cpp b/src/DataVampire.cpp
index 74591919edc64bba8706fca09dedc4b28ec1e251..c49a881befa573c6faa8f4e4efdfcb6ae5a1565b 100644
--- a/src/DataVampire.cpp
+++ b/src/DataVampire.cpp
@@ -2089,7 +2089,7 @@ void DataVampire::store_data(Tango::DeviceData *cmd_value, int32_t num_samples,
 					for (int k = roi[0]; k <= roi[2]; k++) {
 						cache_buffer[cache_idx].databuf[cnt] = data[j * *attr_Width_read + k];
 						//cache_buffer[cache_idx].databuf[cnt] = k;
-						if ((data[j * *attr_Width_read + k] >= *attr_MinThreshold_read) || 
+						if ((data[j * *attr_Width_read + k] >= *attr_MinThreshold_read) && 
 							(data[j * *attr_Width_read + k] <= *attr_MaxThreshold_read)) 
 							cache_buffer[cache_idx].datavalid[cnt] = true;
 						else
@@ -2105,7 +2105,7 @@ void DataVampire::store_data(Tango::DeviceData *cmd_value, int32_t num_samples,
 				for (int k = roi[0]; k <= roi[1]; k++) {
 					cache_buffer[cache_idx].databuf[cnt] = data[k];
 
-					if ((data[k] >= *attr_MinThreshold_read) || (data[k] <= *attr_MaxThreshold_read)) 
+					if ((data[k] >= *attr_MinThreshold_read) && (data[k] <= *attr_MaxThreshold_read)) 
 						cache_buffer[cache_idx].datavalid[cnt] = true;
 					else
 						cache_buffer[cache_idx].datavalid[cnt] = false;