fixes #6608 name empty on save