diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp
index 55bd887f..0a6a17ff 100644
--- a/Graphs/gFlagsLine.cpp
+++ b/Graphs/gFlagsLine.cpp
@@ -137,9 +137,9 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
     // Draw text label
     float x,y;
     GetTextExtent(m_label,x,y);
-    w.qglColor(Qt::black);
-    w.renderText(start_px-x-10,(scry-line_top)-(line_h/2)+(y/2),m_label);
-    //DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
+    //w.qglColor(Qt::black);
+    //w.renderText(start_px-x-10,(scry-line_top)-(line_h/2)+(y/2),m_label);
+    DrawText(w,m_label,start_px-x-10,(scry-line_top)-(line_h/2)+(y/2));
     float x1,x2;
 
     float top=floor(line_top)+2;
diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp
index 9b71ab42..47b9c7b8 100644
--- a/Graphs/gXAxis.cpp
+++ b/Graphs/gXAxis.cpp
@@ -165,8 +165,8 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
             }
         }
 
-        w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr);
-        //DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0);
+        //w.renderText(px-(x/2),scry-(w.GetBottomMargin()-18),tmpstr);
+        DrawText(w,tmpstr,px-(x/2),scry-(w.GetBottomMargin()-18),0);
         py=px;
         for (int j=1;j<10;j++) {
             py+=step_pixels;
diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp
index e6e09538..d16d4e11 100644
--- a/Graphs/gYAxis.cpp
+++ b/Graphs/gYAxis.cpp
@@ -150,8 +150,8 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
         GetTextExtent(fd,x,y);
         if (x>labelW) labelW=x;
         h=start_py+ty;
-        w.renderText(start_px-12-x,scry-(h-(y/2.0)),fd);
-        //DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0,m_text_color);
+        //w.renderText(start_px-12-x,scry-(h-(y/2.0)),fd);
+        DrawText(w,fd,start_px-12-x,scry-(h-(y/2.0)),0,m_text_color);
 
         vertarray[vertcnt++]=start_px-4;
         vertarray[vertcnt++]=h;
diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp
index d6165071..de1f305a 100644
--- a/Graphs/glcommon.cpp
+++ b/Graphs/glcommon.cpp
@@ -136,13 +136,14 @@ void DrawTextQueue(gGraphWindow & wid)
 void DrawText(gGraphWindow &wid,QString text, int x, int  y, float angle, QColor color,QFont *font)
 {
     if (angle!=0) {
-        //TextBuffer *b=new TextBuffer(text,x,y,angle,color,font);
         TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font));
     } else {
-        TextQue.push_back(TextBuffer(text,x,y,0,color,font));
+        //TextQue.push_back(TextBuffer(text,x,y,0,color,font));
         //wid.qglColor(color);
         //wid.renderText(x,wid.GetScrY()-y,0,text,*font);
-        //TextQue.push_back(b);
+        QPainter painter(&wid);
+        RDrawText(painter,text,x,y,0,color,font);
+        painter.end();
     }
 }