[#158554] Fix polyhierarchical bug