Additional fix to reduce the chance of random failure in the regression
test.