Self thread links fix