Eventqueue overflow fix

Don't merge yet.