Fix tree locators
Merge pull request #772 from psav/fix_tree

Fix tree locators