Fix hierarchy in 4.8
Merge pull request #18 from jubianchi/master

Fix hierarchy in 4.8