diff --git a/MAC/Services/src/PipelineControl.py b/MAC/Services/src/PipelineControl.py
index ce5f9e06857b3256ef0fe364a9c64c83b43b027b..12c19e86f50f76d1edac2aafd4babb3a18f9e875 100755
--- a/MAC/Services/src/PipelineControl.py
+++ b/MAC/Services/src/PipelineControl.py
@@ -143,10 +143,10 @@ class Parset(dict):
     return result
 
   def processingNumberOfCoresPerTask(self):
-    result = int(self[PARSET_PREFIX + "Observation.Cluster.ProcessingCluster.numberOfCoresPerTask"]) or "20"
-    if result < 1 or result > 20:
-        logger.warn('Invalid Observation.Cluster.ProcessingCluster.numberOfCoresPerTask: %s, defaulting to %s', result, max(1, min(20, result)))
-    return max(1, min(20, result))
+    result = int(self[PARSET_PREFIX + "Observation.Cluster.ProcessingCluster.numberOfCoresPerTask"]) or "21"
+    if result != 21:
+        logger.warn('Invalid Observation.Cluster.ProcessingCluster.numberOfCoresPerTask: %s, defaulting to %s', result, 21)
+    return 21
 
   def processingNumberOfTasks(self):
     """ Parse the number of nodes to allocate from "Observation.Cluster.ProcessingCluster.numberOfTasks",