Added extra condition for load events