Just a small change to make it easier to override since the threading is out of the user's control.