random-hangs: attempt to fix random hangs pt II