Fix missing EventId bug