diff --git a/ChangeLog b/ChangeLog
index d0d930302..be8449d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-02 Paolo Nenzi <p.nenzi@ieee.org>
+ * src/frontend/rawfile.c: Fixed rawfile ascii generation. The prevoius patch
+   produced incorrect string like v(v(1)) for v(1) in the output file. 
+
 2007-12-31 Holger Vogt
  * src/frontend/com_chdir.c: fix for the crashing of ngspice under Windows when
    started from windows explorer.
diff --git a/src/frontend/rawfile.c b/src/frontend/rawfile.c
index c73cb757b..7fcf53a22 100644
--- a/src/frontend/rawfile.c
+++ b/src/frontend/rawfile.c
@@ -165,7 +165,7 @@ raw_write(char *name, struct plot *pl, bool app, bool binary)
         fprintf(fp, "\t%d\ti(%s)\t%s", i++, v->v_name, ft_typenames(v->v_type));
 	if ( branch != NULL ) *branch = '#';
       } else if ( strcmp( ft_typenames(v->v_type), "voltage" ) == 0 ) {
-        fprintf(fp, "\t%d\tv(%s)\t%s", i++, v->v_name, ft_typenames(v->v_type));
+        fprintf(fp, "\t%d\t%s\t%s", i++, v->v_name, ft_typenames(v->v_type)); /* XXX*/
       } else {
         fprintf(fp, "\t%d\t%s\t%s", i++, v->v_name, ft_typenames(v->v_type));
       }