re-add idempotency check