rework event retry after consistency detection