diff --git a/src/calng/CrystfelRunner.py b/src/calng/CrystfelRunner.py
index 15baa40566caf1cddcff9957ea098d06022f95a3..9238fde5db0c8f106979c9d4d904297bef72953a 100644
--- a/src/calng/CrystfelRunner.py
+++ b/src/calng/CrystfelRunner.py
@@ -68,7 +68,10 @@ def reparse_fix_comma_mess(l):
     final = list()
     current_group = list()
     for current in res:
-        if re.match(r"(\d+)", current):
+        if (len(current_group) > 0
+            and re.match(r"(\d+)", current)
+            and re.match(r".*(\d+)$", current_group[-1])
+            ):
             current_group += [current]
         else:
             # flush what was there first
@@ -303,6 +306,7 @@ class CrystfelRunner(PythonDevice):
             .defaultValue(
                 [
                     "--pdb=/gpfs/exfel/exp/XMPL/201750/p700000/proc/r0030/hewl.cell",
+                    "-j", "40",
                     "--highres=1.6",
                     "--peaks=peakfinder8",
                     "--threshold=200",