AS1/2 node selection fix