Broken threading fix