diff --git a/gerbview/rs274d.cpp b/gerbview/rs274d.cpp
index 73285eac6b..d7536e15eb 100644
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
@@ -1209,7 +1209,7 @@ bool GERBER::Execute_DCODE_Command( WinEDA_GerberFrame* frame,
                                 pcb->m_Track.Append( track );
                                 D( printf( "R:%p\n", track ); )
                                 fillRoundFlashTRACK( track, dcode, activeLayer,
-                                                     m_CurrentPos, diameter, exposure );
+                                                     curPos, diameter, exposure );
                             }
                             break;
 
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index 72f97fb7ae..d7c85bf06c 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -537,9 +537,9 @@ bool GetEndOfBlock( char buff[GERBER_BUFZ], char*& text, FILE* gerber_file )
 
 static bool CheckForLineEnd(  char buff[GERBER_BUFZ], char*& text, FILE* fp  )
 {
-    while( *text == '\n' || !*text )
+    while( *text == '\n' || *text == '\r' || !*text )
     {
-        if( *text == '\n' )
+        if( *text == '\n' || *text == '\r' )
             ++text;
 
         if( !*text )