#Fix to EventsApi