Fix node selection