Fixed getEventId method