Threading issue solved