- fixed idempotence handling