diff --git a/spectra.cpp b/spectra.cpp
index 48ae751393fc59a8962fab18662da7d794511d9c..a9af27b899d53c9f831e6db83f8be8c51321f4a2 100644
--- a/spectra.cpp
+++ b/spectra.cpp
@@ -118,7 +118,7 @@ void EisSpectra::saveToStream(std::ostream& stream) const
 	stream<<F_MAGIC<<", "<<std::to_string(F_VERSION_MAJOR)<<'.'
 		<<std::to_string(F_VERSION_MINOR)<<'.'<<std::to_string(F_VERSION_PATCH)<<'\n';
 
-	stream<<'"'<<model<<'"'<<'\n'<<(headerDescription.empty() ? "None" : headerDescription)<<'\n'<<(header.empty() ? "None" : header);
+	stream<<'"'<<(model.empty() ? "None" : model)<<'"'<<'\n'<<(headerDescription.empty() ? "None" : headerDescription)<<'\n'<<(header.empty() ? "None" : header);
 
 	if(!labels.empty())
 	{
@@ -192,7 +192,7 @@ EisSpectra EisSpectra::loadFromStream(std::istream& stream)
 	if(fileVersion.minor == F_VERSION_MINOR)
 	{
 		std::getline(stream, line);
-		out.model = line;
+		out.model = line == "None" ? "" : line;
 		std::getline(stream, line);
 		out.headerDescription = line == "None" ? "" : line;
 		std::getline(stream, line);