diff --git a/Exchange.cxx b/Exchange.cxx
index 6c851571..3e57a383 100644
--- a/Exchange.cxx
+++ b/Exchange.cxx
@@ -363,19 +363,18 @@ cxxExchange::read_raw(CParser & parser, bool check)
 				parser.set_echo_stream(CParser::EO_NONE);
 				ec.read_raw(parser, false);
 				parser.set_echo_file(eo);
-				parser.set_echo_file(eo_s);
+				parser.set_echo_stream(eo_s);
+				parser.seekg(pos).clear();
+				parser.seekg(pos);
 
 				if (this->exchComps.find(ec.get_formula()) != this->exchComps.end())
 				{
 					cxxExchComp & comp = this->exchComps.find(ec.get_formula())->second;
-					parser.seekg(pos).clear();
-					parser.seekg(pos);
+
 					comp.read_raw(parser, false);
 				}
 				else
 				{
-					parser.seekg(pos).clear();
-					parser.seekg(pos);
 					cxxExchComp ec1;
 					ec1.read_raw(parser, false);
 					std::string str(ec1.get_formula());
diff --git a/PPassemblage.cxx b/PPassemblage.cxx
index b4b96f20..5611b15d 100644
--- a/PPassemblage.cxx
+++ b/PPassemblage.cxx
@@ -240,7 +240,7 @@ cxxPPassemblage::read_raw(CParser & parser, bool check)
 				parser.set_echo_stream(CParser::EO_NONE);
 				ppComp.read_raw(parser, false);
 				parser.set_echo_file(eo);
-				parser.set_echo_file(eo_s);
+				parser.set_echo_stream(eo_s);
 
 				if (this->ppAssemblageComps.find(ppComp.get_name()) != this->ppAssemblageComps.end())
 				{
diff --git a/SSassemblage.cxx b/SSassemblage.cxx
index 101c7949..c46b3c41 100644
--- a/SSassemblage.cxx
+++ b/SSassemblage.cxx
@@ -215,7 +215,7 @@ cxxSSassemblage::read_raw(CParser & parser, bool check)
 				parser.set_echo_stream(CParser::EO_NONE);
 				ec.read_raw(parser, false);
 				parser.set_echo_file(eo);
-				parser.set_echo_file(eo_s);
+				parser.set_echo_stream(eo_s);
 				parser.seekg(pos).clear();
 				parser.seekg(pos);
 
diff --git a/Surface.cxx b/Surface.cxx
index 1d79498b..9c4293e8 100644
--- a/Surface.cxx
+++ b/Surface.cxx
@@ -517,7 +517,7 @@ cxxSurface::read_raw(CParser & parser, bool check)
 				parser.set_echo_stream(CParser::EO_NONE);
 				ec.read_raw(parser, false);
 				parser.set_echo_file(eo);
-				parser.set_echo_file(eo_s);
+				parser.set_echo_stream(eo_s);
 				parser.seekg(pos).clear();
 				parser.seekg(pos);
 
@@ -549,7 +549,7 @@ cxxSurface::read_raw(CParser & parser, bool check)
 				parser.set_echo_stream(CParser::EO_NONE);
 				ec.read_raw(parser, false);
 				parser.set_echo_file(eo);
-				parser.set_echo_file(eo_s);
+				parser.set_echo_stream(eo_s);
 				parser.seekg(pos).clear();
 				parser.seekg(pos);
 
diff --git a/cxxKinetics.cxx b/cxxKinetics.cxx
index 4b8299ce..9bee131e 100644
--- a/cxxKinetics.cxx
+++ b/cxxKinetics.cxx
@@ -388,7 +388,7 @@ cxxKinetics::read_raw(CParser & parser, bool check)
 				parser.set_echo_stream(CParser::EO_NONE);
 				ec.read_raw(parser, false);
 				parser.set_echo_file(eo);
-				parser.set_echo_file(eo_s);
+				parser.set_echo_stream(eo_s);
 				parser.seekg(pos).clear();
 				parser.seekg(pos);