diff --git a/bindings.js b/bindings.js
index 97af31a..9a6598c 100644
--- a/bindings.js
+++ b/bindings.js
@@ -14,6 +14,7 @@ var fs = require('fs')
       , compiled: process.env.NODE_BINDINGS_COMPILED_DIR || 'compiled'
       , platform: process.platform
       , arch: process.arch
+      , nodePreGyp: 'node-v' + process.versions.modules + '-' + process.platform + '-' + process.arch
       , version: process.versions.node
       , bindings: 'bindings.node'
       , try: [
@@ -32,6 +33,8 @@ var fs = require('fs')
         , [ 'module_root', 'build', 'default', 'bindings' ]
           // Production "Release" buildtype binary (meh...)
         , [ 'module_root', 'compiled', 'version', 'platform', 'arch', 'bindings' ]
+          // node-pre-gyp path ./lib/binding/{node_abi}-{platform}-{arch}
+        , [ 'module_root', 'lib', 'binding', 'nodePreGyp', 'bindings' ]
         ]
     }
 
@@ -49,10 +52,10 @@ function bindings (opts) {
   } else if (!opts) {
     opts = {}
   }
-  
+
   // maps `defaults` onto `opts` object
   Object.keys(defaults).map(function(i) {
-    if (!(i in opts) opts[i] = defaults[i];
+    if (!(i in opts)) opts[i] = defaults[i];
   });
 
   // Get the module root
diff --git a/package.json b/package.json
index f7daf93..fcac1c6 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "c",
     "c++"
   ],
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "Nathan Rajlich <nathan@tootallnate.net> (http://tootallnate.net)",
   "repository": {
     "type": "git",