fixing hierarchy