Fixed #163 entry global tree
Merge branch 'bugfix/163' into develop