Add events fix