Fix on eventlist