$tree is really $this
Merge pull request #1466 from ExchangeCore/Develop

$tree is really $this