Trying to fix hangs.