Fixed orphan nodes