Another threading fix