Fix to add event