Fix heirarchy