Fix event validator