EventId bugfix