Trying a different approach to orphaning fix