Event vector bugfix