fix for the problem where name could be reset