TREE-36 another tree fix