1 files changed, 5 insertions, 1 deletions

diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index 1f3079d8..55323e15 100644
--- a/src/ext/Util/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
@@ -435,11 +435,15 @@ namespace WixToolset.Util
         {
             foreach (var row in table.Rows)
             {
-                this.DecompilerHelper.AddElementToRoot(UtilConstants.GroupName,
+                var group = new XElement(UtilConstants.GroupName,
                     new XAttribute("Id", row.FieldAsString(0)),
                     new XAttribute("Name", row.FieldAsString(2)),
                     AttributeIfNotNull("Domain", row, 3)
                     );
+
+                this.DecompilerHelper.AddElementToRoot(group);
+
+                this.DecompilerHelper.IndexElement(row, group);
             }
         }
         /// <summary>