Ok. I'll move to `commit_on_success`, thanks. Looking at the source of that it looks good.