diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index 40e03443ddf76c99d63296b78562d34337d451b7..ea9bc3547f3d00702ab9e5e90b80faeb04a3517d 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -424,12 +424,19 @@ def run():
                     if not isinstance(defcval, (list, tuple)):
                         cvals = range(defcval)
                     else:
-                        cvals = defcval    
-                else:
-                    for p in parms:
-                        if p.name == cvar:
-                            cvals = p.value
-                            print("Concurrency parameter '{}' is taken from '{}'".format(cvar, notebook))
+                        cvals = defcval
+
+            if cvals is None:
+                print (parms)
+                for p in parms:
+                    if p.name == cvar:
+                        defcval = p.value
+                if defcval is not None:
+                    print("Concurrency parameter '{}' is taken from '{}'".format(cvar, notebook))
+                    if not isinstance(defcval, (list, tuple)):
+                        cvals = [defcval]
+                    else:
+                        cvals = defcval
 
             if con_func:
                 func = get_concurrency_function(nb, con_func)