Type hierarchy fix