Fixed the loading issue of events