Updated for Treeview fix