diff --git a/setup.py b/setup.py
index d5157c3..edab1bb 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setup(name='wavinfo',
-      version='1.3',
+      version='1.3.1',
       author='Jamie Hardt',
       author_email='jamiehardt@me.com',
       description='Probe WAVE Files for iXML, Broadcast-WAVE and other metadata.',
diff --git a/wavinfo/riff_parser.py b/wavinfo/riff_parser.py
index 21833a7..6366ae5 100644
--- a/wavinfo/riff_parser.py
+++ b/wavinfo/riff_parser.py
@@ -32,43 +32,41 @@ class ChunkDescriptor(namedtuple('ChunkDescriptor', 'ident start length rf64_con
 
 def parse_list_chunk(stream, length, rf64_context=None):
     start = stream.tell()
-
     signature = stream.read(4)
 
     children = []
-    while (stream.tell() - start) < length:
+    while (stream.tell() - start + 8) < length:
         child_chunk = parse_chunk(stream, rf64_context=rf64_context)
-        if child_chunk:
-            children.append(child_chunk)
-        else: 
-            break
+        children.append(child_chunk)
+
+    stream.seek(start + length)
 
     return ListChunkDescriptor(signature=signature, children=children)
 
 
 def parse_chunk(stream, rf64_context=None):
+    header_start = stream.tell()
     ident = stream.read(4)
     size_bytes = stream.read(4)
 
-    if len(ident) != 4 or len(size_bytes) < 4:
-        raise WavInfoEOFError(identifier=ident, chunk_start=stream.tell() - 4)
+    if len(ident) != 4 or len(size_bytes) != 4:
+        raise WavInfoEOFError(identifier=ident, chunk_start=header_start)
 
-    size_bytes = stream.read(4)
-    size = struct.unpack('<I', size_bytes)[0]
-    
-    if size == 0xFFFFFFFF:
+    data_size = struct.unpack('<I', size_bytes)[0]
+
+    if data_size == 0xFFFFFFFF:
         if rf64_context is None and ident == b'RF64':
             rf64_context = parse_rf64(stream=stream)
         
-        size = rf64_context.bigchunk_table[ident] 
+        data_size = rf64_context.bigchunk_table[ident]
             
-    displacement = size
+    displacement = data_size
     if displacement % 2 is not 0:
         displacement = displacement + 1
 
     if ident in [b'RIFF', b'LIST', b'RF64']:
-        return parse_list_chunk(stream=stream, length=size, rf64_context=rf64_context)
+        return parse_list_chunk(stream=stream, length=data_size, rf64_context=rf64_context)
     else:
-        start = stream.tell()
+        data_start = stream.tell()
         stream.seek(displacement, 1)
-        return ChunkDescriptor(ident=ident, start=start, length=size, rf64_context=rf64_context)
+        return ChunkDescriptor(ident=ident, start=data_start, length=data_size, rf64_context=rf64_context)