Another attempt at fixing random failures.