Potential fix for hangs