diff --git a/index.js b/index.js
index 4835a8d..df57cc5 100644
--- a/index.js
+++ b/index.js
@@ -219,7 +219,7 @@ module.exports = Base = Class.extend({
 
   dropTable: function(tableName, options, callback) {
 
-    if (arguments.length < 3) {
+    if (arguments.length < 3 && typeof(options) === 'function') {
       callback = options;
       options = {};
     }
diff --git a/package.json b/package.json
index 21d936a..8ad5dc7 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,6 @@
   },
   "homepage": "https://github.com/db-migrate/db-migrate-base",
   "dependencies": {
-    "bluebird": "^2.9.34"
+    "bluebird": "^3.1.1"
   }
 }