Fixed node picking (finally!)