Fix an instance of structural navigation looping