Use claim_commit in queue run