Fix a bug with Hierarchy