diff --git a/ChangeLog b/ChangeLog
index ca66879cd..7a372c52b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-19 Holger Vogt
+ * subckt.c: line indentations
+   com_measure2.c: remove bug, see support tracker no. 3013968
+
 2010-06-19  Robert Larice
  * ng-spice-rework/src/xspice/Makefile.am:
 	exclude some junk from `make dist'
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index 19d79a301..91327e7aa 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -1413,7 +1413,7 @@ get_measure2(
                return MEASUREMENT_FAILURE;
             }
 
-            measure_at(measFind, measFind->m_measured);
+            measure_at(meas, measFind->m_measured);
             meas->m_measured = measFind->m_measured;
 
          } else {
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 3c274c418..1163afba6 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -360,14 +360,15 @@ inp_subcktexpand(struct line *deck)
       ok= ok && nupa_signal(NUPASUBDONE, NULL); 
       c= ll;
       while (c != NULL) { 
-	/* 'param' .meas statements can have dependencies on measurement values */
-	/* need to skip evaluating here and evaluate after other .meas statements */
-        if ( ciprefix( ".meas", c->li_line ) ) {
-	  if ( !strstr( c->li_line, "param" ) ) nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
-	} else {
-	  nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
-	}
-	c= c->li_next;
+      /* 'param' .meas statements can have dependencies on measurement values */
+      /* need to skip evaluating here and evaluate after other .meas statements */
+         if ( ciprefix( ".meas", c->li_line ) ) {
+            if ( !strstr( c->li_line, "param" ) ) 
+               nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
+         } else {
+            nupa_eval( c->li_line, c->li_linenum, c->li_linenum_orig);
+         }
+         c= c->li_next;
       }
 #ifdef TRACE
       fprintf(stderr,"Numparams converted deck:\n");