More idempotency
Merge pull request #1 from kamaradclimber/idempotency

More idempotency