Re #1767 Fixed recurring issue with hierarchy check