diff --git a/SMBLibrary/Server/SMBServer.SMB1.cs b/SMBLibrary/Server/SMBServer.SMB1.cs
index 8685d1d..04b4df3 100644
--- a/SMBLibrary/Server/SMBServer.SMB1.cs
+++ b/SMBLibrary/Server/SMBServer.SMB1.cs
@@ -42,12 +42,17 @@ namespace SMBLibrary.Server
                     reply.Header = header;
                     for (int index = 0; index < responses.Count; index++)
                     {
-                        if (responses[index] is SMBAndXCommand || index == responses.Count - 1)
+                        if (reply.Commands.Count == 0 ||
+                            reply.Commands[reply.Commands.Count - 1] is SMBAndXCommand)
                         {
                             reply.Commands.Add(responses[index]);
                             responses.RemoveAt(index);
                             index--;
                         }
+                        else
+                        {
+                            break;
+                        }
                     }
                     EnqueueMessage(state, reply);
                 }