Fix node saving