EventVector fix up