Fixed hierarchy resolution