diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc
index 076a224b39aff9..5dbc2788463105 100644
--- a/src/fs_event_wrap.cc
+++ b/src/fs_event_wrap.cc
@@ -110,8 +110,8 @@ void FSEventWrap::Start(const FunctionCallbackInfo<Value>& args) {
 
   String::Utf8Value path(args[0]);
 
-  int flags = 0;
-  if (args[1]->IsTrue())
+  unsigned int flags = 0;
+  if (args[2]->IsTrue())
     flags |= UV_FS_EVENT_RECURSIVE;
 
   int err = uv_fs_event_init(wrap->env()->event_loop(), &wrap->handle_);
diff --git a/test/pummel/test-fs-watch-non-recursive.js b/test/pummel/test-fs-watch-non-recursive.js
new file mode 100644
index 00000000000000..374a15e271cd23
--- /dev/null
+++ b/test/pummel/test-fs-watch-non-recursive.js
@@ -0,0 +1,49 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var path = require('path');
+var fs = require('fs');
+
+var testDir = common.tmpDir;
+var testsubdir = path.join(testDir, 'testsubdir');
+var filepath = path.join(testsubdir, 'watch.txt');
+
+function cleanup() {
+  try { fs.unlinkSync(filepath); } catch (e) { }
+  try { fs.rmdirSync(testsubdir); } catch (e) { }
+}
+process.on('exit', cleanup);
+cleanup();
+
+try { fs.mkdirSync(testsubdir, 0700); } catch (e) {}
+
+// Need a grace period, else the mkdirSync() above fires off an event.
+setTimeout(function() {
+  var watcher = fs.watch(testDir, { persistent: true }, assert.fail);
+  setTimeout(function() {
+    fs.writeFileSync(filepath, 'test');
+  }, 100);
+  setTimeout(function() {
+    watcher.close();
+  }, 500);
+}, 50);