Bug fix of parallelization from recent commit