Bugfix for failing idempotence test