attempt to fix bz 1057767 -- freeze on large cluster