diff --git a/src/X12.Hipaa.ClaimParser/Program.cs b/src/X12.Hipaa.ClaimParser/Program.cs
index 0d5210f7..4da02ab0 100644
--- a/src/X12.Hipaa.ClaimParser/Program.cs
+++ b/src/X12.Hipaa.ClaimParser/Program.cs
@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Configuration;
     using System.IO;
+    using System.Linq;
     using System.Xml;
 
     using Fonet;
diff --git a/src/X12.Parsing/X12StreamReader.cs b/src/X12.Parsing/X12StreamReader.cs
index 05d6fdee..22413d4a 100644
--- a/src/X12.Parsing/X12StreamReader.cs
+++ b/src/X12.Parsing/X12StreamReader.cs
@@ -170,10 +170,12 @@ public X12FlatTransaction ReadNextTransaction()
         {
             var segments = new StringBuilder();
 
-            string segmentString = this.ReadNextSegment();
-            string segmentId = this.ReadSegmentId(segmentString);
+            string segmentString;
+            string segmentId;
             do
             {
+                segmentString = this.ReadNextSegment();
+                segmentId = this.ReadSegmentId(segmentString);
                 switch (segmentId)
                 {
                     case "ISA":
@@ -195,9 +197,6 @@ public X12FlatTransaction ReadNextTransaction()
                         segments.Append(this.Delimiters.SegmentTerminator);
                         break;
                 }
-
-                segmentString = this.ReadNextSegment();
-                segmentId = this.ReadSegmentId(segmentString);
             }
             while (!string.IsNullOrEmpty(segmentString) && segmentId != "SE");