Fix hierarchy.