Trying to fix the tree