Fixed bug with NameLink and lists