diff --git a/index.js b/index.js
index 087f1b4..b2464c9 100755
--- a/index.js
+++ b/index.js
@@ -6,7 +6,7 @@ var path     = require('path')
 var chpro    = require('child_process')
 
 var through  = require('through')
-var csv      = require('csv-stream')
+var csv = require('fast-csv')
 var osenv    = require('osenv')
 var duplexer = require('duplexer')
 var concat   = require('concat-stream')
@@ -33,12 +33,12 @@ module.exports = function (options) {
   var write = fs.createWriteStream(filename)
     .on('close', function () {
       var child = spawn(require.resolve('j/bin/j.njs'), spawnArgs)
-      child.stdout.pipe(csv.createStream(options))
+      child.stdout.pipe(csv(options))
         .pipe(through(function (data) {
           var _data = {}
           for(var k in data) {
             var value = data[k].trim()
-            _data[k.trim()] = isNaN(value) ? value : +value
+            _data[k.trim()] = (isNaN(value) || value === '') ? value : +value;
           }
           this.queue(_data)
         }))
diff --git a/package.json b/package.json
index 62ea2fe..d88f0d8 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "JSONStream": "^1.0.4",
     "concat-stream": "^1.4.6",
-    "csv-stream": "~0.1.3",
     "duplexer": "~0.1.1",
+    "fast-csv": "^2.0.0",
     "j": "^0.4.3",
     "minimist": "^1.1.1",
     "osenv": "^0.1.3",