Fix node change returns