Make repeat runs idempotent