Fix hangs