diff --git a/README.md b/README.md
index ad6455a..8c379f2 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A library designed to convert sql.Rows result from a query into a **CSV.GZIP** f
  
 ### Installation
 ```go 
-go get github.com/thatInfrastructureGuy/sqltocsvgzip@v0.0.10
+go get github.com/thatInfrastructureGuy/sqltocsvgzip@v0.0.13
 ```
 
 _Note: Please do not use master branch. Master branch may contain breaking changes. Use tags instead._
diff --git a/csv.go b/csv.go
index 02fb946..ea99b87 100644
--- a/csv.go
+++ b/csv.go
@@ -30,22 +30,22 @@ func (c *Converter) setCSVHeaders(csvWriter *csv.Writer) ([]string, int, error)
 		return nil, 0, err
 	}
 
-	if c.WriteHeaders {
-		// use Headers if set, otherwise default to
-		// query Columns
-		if len(c.Headers) > 0 {
-			headers = c.Headers
-		} else {
-			headers = columnNames
-		}
+	// Use Headers if set, otherwise default to
+	// query Columns
+	if len(c.Headers) > 0 {
+		headers = c.Headers
+	} else {
+		headers = columnNames
 	}
 
 	// Write to CSV Buffer
-	err = csvWriter.Write(headers)
-	if err != nil {
-		return nil, 0, err
+	if c.WriteHeaders {
+		err = csvWriter.Write(headers)
+		if err != nil {
+			return nil, 0, err
+		}
+		csvWriter.Flush()
 	}
-	csvWriter.Flush()
 
 	return headers, len(headers), nil
 }