Fix walk_tree