one more threading fix