diff --git a/comma.cabal b/comma.cabal
--- a/comma.cabal
+++ b/comma.cabal
@@ -1,8 +1,8 @@
 name:                comma
-version:             1.0.0
+version:             1.0.1
 synopsis:            CSV Parser & Producer
 description:         Comma is a simple CSV format parser and producer that
-                     closely follows the RFC4810 document.
+                     closely follows the RFC4180 document.
 homepage:            https://github.com/lovasko/comma
 license:             OtherLicense
 license-file:        LICENSE
diff --git a/src/Text/Comma.hs b/src/Text/Comma.hs
--- a/src/Text/Comma.hs
+++ b/src/Text/Comma.hs
@@ -43,7 +43,7 @@
         -> T.Text     -- ^ CSV text
 uncomma = T.unlines . map (\r -> T.concat $ intersperse "," (map conv r))
   where
-    isQuoted  = T.any (`elem` ['"', '\n', '\r'])
+    isQuoted  = T.any (`elem` ['"', '\n', '\r', ','])
     enquote x = T.concat ["\"", x, "\""]
     conv f
       | isQuoted f = enquote (T.replace "\"" "\"\"" f)
diff --git a/test/Prop.hs b/test/Prop.hs
--- a/test/Prop.hs
+++ b/test/Prop.hs
@@ -9,7 +9,7 @@
 -- | Generate the content of a field.
 genField :: Gen T.Text
 genField = fmap T.pack (replicateM 5 $ elements alphabet)
-  where alphabet = ['a'..'z'] ++ ['A'..'Z'] ++ "\"\n"
+  where alphabet = ['a'..'z'] ++ ['A'..'Z'] ++ "\"\r\n,"
 
 -- | Random-generated instances of CSV.
 instance Arbitrary CSV where