use a correct definition of tree-member
Add more cases
Fix another case