diff --git a/SabreTools.Library/DatFiles/MameListxml.cs b/SabreTools.Library/DatFiles/MameListxml.cs
index d2b9ce14..819fb30a 100644
--- a/SabreTools.Library/DatFiles/MameListxml.cs
+++ b/SabreTools.Library/DatFiles/MameListxml.cs
@@ -58,7 +58,9 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
-			// new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			// TODO: Use the following implementation instead of passing to Logiqx
+			new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			return;
 
 			// Prepare all internal variables
 			Encoding enc = Utilities.GetEncoding(filename);
diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs
index 0f9c1677..9c1d516e 100644
--- a/SabreTools.Library/DatFiles/OfflineList.cs
+++ b/SabreTools.Library/DatFiles/OfflineList.cs
@@ -57,7 +57,9 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
+			// TODO: Use the following implementation instead of passing to Logiqx
 			new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			return;
 		}
 
 		/// <summary>
diff --git a/SabreTools.Library/DatFiles/SabreDat.cs b/SabreTools.Library/DatFiles/SabreDat.cs
index 235bf91e..d275c743 100644
--- a/SabreTools.Library/DatFiles/SabreDat.cs
+++ b/SabreTools.Library/DatFiles/SabreDat.cs
@@ -57,7 +57,9 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
+			// TODO: Use the following implementation instead of passing to Logiqx
 			new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			return;
 		}
 
 		/// <summary>
diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs
index 2c2f43a2..a50bfa99 100644
--- a/SabreTools.Library/DatFiles/SoftwareList.cs
+++ b/SabreTools.Library/DatFiles/SoftwareList.cs
@@ -58,7 +58,9 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
-			// new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			// TODO: Use the following implementation instead of passing to Logiqx
+			new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
+			return;
 
 			// Prepare all internal variables
 			Encoding enc = Utilities.GetEncoding(filename);