diff --git a/ChangeLog b/ChangeLog
index 900221035..31c15d83e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-12 Holger Vogt
+  * spicenum.c, xpressn.c: dico and inst_dico not removed in nupa_done 
+    because they are needed in .measure
+  * lexical.c: size of arrays doubled in cp_lexer() to avoid "line too long"
+    message
+  * runcoms.c: enter do_measure() only if ft_curckt->ci_last_an has a value
+    (bug no. 2751855) 
+
 2009-04-10 Holger Vogt
   * spicenum.c: memory leak removed
   
diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index fd533fde9..212d9b688 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -454,7 +454,10 @@ nupa_done (void)
     }
   nerrors = dico->errcount;
   dictsize = donedico (dico);
-
+  /* We cannot remove dico here because numparam is usedby
+  the .measure statement, which is invoked only after the 
+  simulation has finished */
+  /*
   for (i = dynmaxline ; i >= 0; i--) {
     dispose ((void *) dico->dynrefptr[i]);
   }
@@ -466,6 +469,7 @@ nupa_done (void)
   dispose ((void *) inst_dico->dyndat);
   dispose ((void *) inst_dico);
   inst_dico = NULL;
+*/
   if (nerrors)
     {
       /* debug: ask if spice run really wanted */
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index 1ef968286..ec8865aec 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -230,7 +230,6 @@ int
 donedico (tdico * dico)
 {
    int sze = dico->nbd;
-   if (dico->dyndat) tfree(dico->dyndat);
    return sze;
 }