fixed hangs