Reducing parallelism
Merge fix