Fix selection of nodes