fixing hangs