diff --git a/src/save.c b/src/save.c
index f81e5533..ee7eaa41 100644
--- a/src/save.c
+++ b/src/save.c
@@ -782,7 +782,7 @@ static int read_dataset(FILE *fd, Raw **rawptr, const char *type, int no_warning
       if(!raw->names) raw->names = my_calloc(_ALLOC_ID_, raw->nvars, sizeof(char *));
       if(!raw->cursor_b_val) raw->cursor_b_val = my_calloc(_ALLOC_ID_, raw->nvars, sizeof(double));
       my_realloc(_ALLOC_ID_, &varname, strlen(line) + 1) ;
-      n = sscanf(line, "%d %s", &i, varname); /* read index and name of saved waveform */
+      n = sscanf(line, "%*[\t]%d%*[\t]%[^\t]", &i, varname); /* read index and name of saved waveform */
       if(n < 2) {
         dbg(0, "read_dataset(): WAARNING: malformed raw file, aborting\n");
         extra_rawfile(3, NULL, NULL, -1.0, -1.0);
diff --git a/src/xschem.tcl b/src/xschem.tcl
index a295d4de..00dbcb0d 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -3132,10 +3132,11 @@ proc graph_delete_nodes {} {
 
 proc graph_get_signal_list {siglist pattern } {
   global graph_sort
+  set siglist [split $siglist \n]
   set direction {-decreasing}
   if {$graph_sort} {set direction {-increasing}}
   set result {}
-  set siglist [join [lsort $direction -dictionary $siglist] \n]
+  set siglist [lsort $direction -dictionary $siglist]
   # just check if pattern is a valid regexp
   set err [catch {regexp $pattern {12345}} res]
   if {$err} {set pattern {}}