attempt to fix idempotency issue