fix loading events and components