diff --git a/Source/ZenLib/ZtringListList.cpp b/Source/ZenLib/ZtringListList.cpp
index af97e0b..0f72a0a 100644
--- a/Source/ZenLib/ZtringListList.cpp
+++ b/Source/ZenLib/ZtringListList.cpp
@@ -336,8 +336,8 @@ void ZtringListList::Write(const Ztring &ToWrite)
             }
             if (IsQuote)
             {
-                //Double quote
-                if (i+Quote_Size*2<=l)
+                //Double quote, only in a quoted field: the quote opening a field is never the first one of a double quote
+                if (q && i+Quote_Size*2<=l)
                 {
                     IsQuote=false;
                     for (size_t j=0; j<Quote_Size; j++)