diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp
index b1573c72a8948f62a59012952f0897a1cb0301cc..b83d73297a34c5a926a72ef4d89dc373ba2e9750 100644
--- a/GUI/Model/Beam/SourceItems.cpp
+++ b/GUI/Model/Beam/SourceItems.cpp
@@ -330,12 +330,12 @@ void ScanItem::readFrom(QXmlStreamReader* r)
             SourceItem::readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
-            // footprint
+            // footprint (moved to base class since v21 (version == 2))
         } else if (version == 1 && tag == Tag::Footprint) {
             m_footprint.readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
-            // footprint groupbox: is expanded?
+            // footprint groupbox: is expanded? (moved to base class since v21 (version == 2))
         } else if (version == 1 && tag == Tag::ExpandFootprintGroupbox) {
             XML::readAttribute(r, XML::Attrib::value, &m_expandFootprint);
             XML::gotoEndElementOfTag(r, tag);
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 01c34f4eafa99b24c50356bbd8d4089935eb441e..964a36257912dd37b152fef6ba53f2a4fdf89461 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -207,7 +207,7 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
             XML::readAttribute(r, XML::Attrib::value, &m_description);
             XML::gotoEndElementOfTag(r, tag);
 
-            // with polarizer or analyzer? (OBSOLETE since v21)
+            // with polarizer or analyzer? (OBSOLETE since v21 (version == 2))
         } else if (version == 1 && tag == Tag::WithPolarizerAnalyzer) {
             XML::readAttribute(r, XML::Attrib::value, &m_withPolarizer);
             m_withAnalyzer = m_withPolarizer;
@@ -218,7 +218,7 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
             XML::readAttribute(r, XML::Attrib::value, &m_withPolarizer);
             XML::gotoEndElementOfTag(r, tag);
 
-            // polarization (alternate tag OBSOLETE since v21)
+            // polarization (alternate tag OBSOLETE since v21 (version == 2))
         } else if (tag == Tag::PolarizerBlochVector || (version == 1 && tag == Tag::Polarization)) {
             m_polarizerBlochVector.readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
@@ -233,17 +233,17 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
             m_analyzerBlochVector.readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
-            // analyzer direction OBSOLETE since v21
+            // analyzer direction OBSOLETE since v21 (version == 2)
         } else if (version == 1 && tag == Tag::AnalyzerDirection) {
             m_analyzerBlochVector.readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
-            // analyzer efficiency OBSOLETE since v21
+            // analyzer efficiency OBSOLETE since v21 (version == 2)
         } else if (version == 1 && tag == Tag::AnalyzerEfficiency) {
             DoubleProperty analyzerEfficiency;
             analyzerEfficiency.readFrom(r);
-            XML::gotoEndElementOfTag(r, tag);
             m_analyzerBlochVector.setR3(m_analyzerBlochVector.r3() * analyzerEfficiency.value());
+            XML::gotoEndElementOfTag(r, tag);
 
             // background
         } else if (tag == Tag::Background) {