Fix unset event queue