fix concerning events