fixed null links bug