Fix hierarchy in 4.8