Event leak fix