Fix empty name save problem