diff --git a/src/rs01-verify.c b/src/rs01-verify.c
index 3a6181a..d47091a 100644
--- a/src/rs01-verify.c
+++ b/src/rs01-verify.c
@@ -56,7 +56,8 @@ void ResetRS01VerifyWindow(Method *self)
    wl->lastPercent = 0;
 
    GuiFillSpiral(wl->cmpSpiral, Closure->background);
-   GuiDrawSpiral(wl->cmpSpiral);
+   if (wl->cmpSpiral->widget)
+      gtk_widget_queue_draw(wl->cmpSpiral->widget);
 }
 
 /***
diff --git a/src/rs01-window.c b/src/rs01-window.c
index 34d061d..52a75e0 100644
--- a/src/rs01-window.c
+++ b/src/rs01-window.c
@@ -174,7 +174,7 @@ void CreateRS01EWindow(Method *method, GtkWidget *parent)
 static gboolean set_max_idle_func(gpointer data)
 {  RS01Widgets *wl = (RS01Widgets*)data;
 
-   redraw_curve(wl);
+   gtk_widget_queue_draw(wl->fixCurve->widget);
 
    return FALSE;
 }
@@ -304,9 +304,7 @@ void ResetRS01FixWindow(Method *method)
    RS01UpdateFixResults(wl, 0, 0);
 
    if(wl->fixCurve && wl->fixCurve->widget)
-   {  gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
-      redraw_curve(wl);
-   }
+      gtk_widget_queue_draw(wl->fixCurve->widget);
 
    wl->percent = 0;
    wl->lastPercent = 0;
diff --git a/src/rs02-verify.c b/src/rs02-verify.c
index 0803312..2a04813 100644
--- a/src/rs02-verify.c
+++ b/src/rs02-verify.c
@@ -59,7 +59,8 @@ void ResetRS02VerifyWindow(Method *self)
    wl->lastPercent = 0;
 
    GuiFillSpiral(wl->cmpSpiral, Closure->background);
-   GuiDrawSpiral(wl->cmpSpiral);
+   if (wl->cmpSpiral->widget)
+      gtk_widget_queue_draw(wl->cmpSpiral->widget);
 }
 
 /***
diff --git a/src/rs02-window.c b/src/rs02-window.c
index 0abda8d..8c3e765 100644
--- a/src/rs02-window.c
+++ b/src/rs02-window.c
@@ -111,7 +111,7 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent)
 static gboolean set_max_idle_func(gpointer data)
 {  RS02Widgets *wl = (RS02Widgets*)data;
 
-   redraw_curve(wl);
+   gtk_widget_queue_draw(wl->fixCurve->widget);
 
    return FALSE;
 }
@@ -239,9 +239,7 @@ void ResetRS02FixWindow(Method *method)
    RS02UpdateFixResults(wl, 0, 0);
 
    if(wl->fixCurve && wl->fixCurve->widget)
-   {  gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
-      redraw_curve(wl);
-   }
+      gtk_widget_queue_draw(wl->fixCurve->widget);
 
    wl->percent = 0;
    wl->lastPercent = 0;
diff --git a/src/rs03-verify.c b/src/rs03-verify.c
index 78d2ab3..d7ef1e9 100644
--- a/src/rs03-verify.c
+++ b/src/rs03-verify.c
@@ -69,7 +69,8 @@ void ResetRS03VerifyWindow(Method *self)
    wl->lastPercent = 0;
 
    GuiFillSpiral(wl->cmpSpiral, Closure->background);
-   GuiDrawSpiral(wl->cmpSpiral);
+   if (wl->cmpSpiral->widget)
+      gtk_widget_queue_draw(wl->cmpSpiral->widget);
 }
 
 /***
diff --git a/src/rs03-window.c b/src/rs03-window.c
index 6b27643..1e8e982 100644
--- a/src/rs03-window.c
+++ b/src/rs03-window.c
@@ -144,7 +144,7 @@ void CreateRS03EncWindow(Method *method, GtkWidget *parent)
 static gboolean set_max_idle_func(gpointer data)
 {  RS03Widgets *wl = (RS03Widgets*)data;
 
-   redraw_curve(wl);
+   gtk_widget_queue_draw(wl->fixCurve->widget);
 
    return FALSE;
 }
@@ -269,9 +269,7 @@ void ResetRS03FixWindow(Method *method)
    RS03UpdateFixResults(wl, 0, 0);
 
    if(wl->fixCurve && wl->fixCurve->widget)
-   {  gdk_window_clear(gtk_widget_get_window(wl->fixCurve->widget));
-      redraw_curve(wl);
-   }
+      gtk_widget_queue_draw(wl->fixCurve->widget);
 
    wl->percent = 0;
    wl->lastPercent = 0;