IMportant bug fix on event vecotr