Fix: editing name causes loss of NAME field
Wrong fix for 'editing causes loss of name' bug