2 files changed, 3 insertions, 4 deletions
diff --git a/Source/ModelViewer/DafnyProvider.cs b/Source/ModelViewer/DafnyProvider.cs
index 6e4698d9..c233d272 100644
--- a/Source/ModelViewer/DafnyProvider.cs
+++ b/Source/ModelViewer/DafnyProvider.cs
@@ -218,6 +218,7 @@ namespace Microsoft.Boogie.ModelViewer.Dafny
 
       public FieldName(Model.Element elt, DafnyModel dm) {
         Field = elt;
+        NameArgs = new Model.Element[Dims];
         var tpl = dm.f_dim.AppWithArg(0, elt);
         if (tpl != null) {
           Dims = tpl.Result.AsInt();
diff --git a/Source/ModelViewer/Namer.cs b/Source/ModelViewer/Namer.cs
index afcb0fe6..0eb2418e 100644
--- a/Source/ModelViewer/Namer.cs
+++ b/Source/ModelViewer/Namer.cs
@@ -485,8 +485,6 @@ namespace Microsoft.Boogie.ModelViewer
 
   public class EdgeName
   {
-    static readonly Model.Element[] emptyArgs = new Model.Element[0];
-
     ILanguageSpecificModel langModel;
     string format;
     string cachedName;
@@ -496,10 +494,10 @@ namespace Microsoft.Boogie.ModelViewer
     {
       this.langModel = n;
       this.format = format;
-      this.args = args;
+      this.args = args.ToArray();
     }
 
-    public EdgeName(string name) : this(null, name, emptyArgs) 
+    public EdgeName(string name) : this(null, name) 
     {
       Util.Assert(name != null);
     }