Re #6924 change the way number of jobs is determined