singleton links fix bug