Fix hierarchy problem