Fix issue on event list