Threading issue seems to be fixed