fix hangs