Event ID fix