HOTFIX: Fixed bug in object tree