Fix a never ending loop bug and only attempt to parallelize if requested