Fix for tree view