Fix for too many events being added and not removed