diff --git a/Source/AcbEditor/Program.cs b/Source/AcbEditor/Program.cs
index 2fdf14d..ca7b756 100644
--- a/Source/AcbEditor/Program.cs
+++ b/Source/AcbEditor/Program.cs
@@ -133,10 +133,14 @@ namespace AcbEditor
                     {
                         while (waveformReader.Read())
                         {
-                            ushort id = waveformReader.GetUInt16("Id");
                             byte encodeType = waveformReader.GetByte("EncodeType");
                             bool streaming = waveformReader.GetBoolean("Streaming");
 
+                            ushort id =
+                                waveformReader.ContainsField("MemoryAwbId") ?
+                                streaming ? waveformReader.GetUInt16("StreamAwbId") : waveformReader.GetUInt16("MemoryAwbId") :
+                                waveformReader.GetUInt16("Id");
+
                             string outputName = id.ToString("D5");
                             if (streaming)
                             {
@@ -247,10 +251,14 @@ namespace AcbEditor
                 {
                     while (reader.Read())
                     {
-                        ushort id = reader.GetUInt16("Id");
                         byte encodeType = reader.GetByte("EncodeType");
                         bool streaming = reader.GetBoolean("Streaming");
 
+                        ushort id = 
+                            reader.ContainsField("MemoryAwbId") ? 
+                            streaming ? reader.GetUInt16("StreamAwbId") : reader.GetUInt16("MemoryAwbId") : 
+                            reader.GetUInt16("Id");
+
                         string inputName = id.ToString("D5");
                         if (streaming)
                         {