Fix hangs due to filling event queue