diff --git a/__tests__/no-return-wrap.js b/__tests__/no-return-wrap.js
index 793a2d2a..fc4cc999 100644
--- a/__tests__/no-return-wrap.js
+++ b/__tests__/no-return-wrap.js
@@ -51,7 +51,10 @@ ruleTester.run('no-return-wrap', rule, {
     {
       code: 'doThing().then(function() { return Promise.reject(4) })',
       options: [{ allowReject: true }]
-    }
+    },
+
+    // not function bind
+    'doThing().then((function() { return Promise.resolve(4) }).toString())'
   ],
 
   invalid: [
@@ -105,11 +108,112 @@ ruleTester.run('no-return-wrap', rule, {
       code:
         'doThing().catch(function(x) {if (x) { return Promise.resolve(4) } else { return Promise.reject() } })',
       errors: [{ message: resolveMessage }, { message: rejectMessage }]
-    }
+    },
 
     // should work someday
     // {code: 'doThing().catch(function(x) { return x && Promise.resolve(4) })', errors: [{message: resolveMessage}]},
     // {code: 'doThing().catch(function(x) { return true ? Promise.resolve(4) : Promise.reject(5) })', errors: [{message: rejectMessage }, {message: resolveMessage}]},
     // {code: 'doThing().catch(function(x) { return x && Promise.reject(4) })', errors: [{message: rejectMessage}]}
+
+    // mltiple "ExpressionStatement"
+    {
+      code: `
+      fn(function() {
+        doThing().then(function() {
+          return Promise.resolve(4)
+        })
+        return
+      })`,
+      errors: [{ message: resolveMessage, line: 4 }]
+    },
+    {
+      code: `
+      fn(function() {
+        doThing().then(function nm() {
+          return Promise.resolve(4)
+        })
+        return
+      })`,
+      errors: [{ message: resolveMessage, line: 4 }]
+    },
+    {
+      code: `
+      fn(function() {
+        fn2(function() {
+          doThing().then(function() {
+            return Promise.resolve(4)
+          })
+        })
+      })`,
+      errors: [{ message: resolveMessage, line: 5 }]
+    },
+    {
+      code: `
+      fn(function() {
+        fn2(function() {
+          doThing().then(function() {
+            fn3(function() {
+              return Promise.resolve(4)
+            })
+            return Promise.resolve(4)
+          })
+        })
+      })`,
+      errors: [{ message: resolveMessage, line: 8 }]
+    },
+
+    // other than "ExpressionStatement"
+    {
+      code: `
+      const o = {
+        fn: function() {
+          return doThing().then(function() {
+            return Promise.resolve(5);
+          });
+        },
+      }
+      `,
+      errors: [{ message: resolveMessage, line: 5 }]
+    },
+    {
+      code: `
+      fn(
+        doThing().then(function() {
+          return Promise.resolve(5);
+        })
+      );
+      `,
+      errors: [{ message: resolveMessage, line: 4 }]
+    },
+
+    // function bind
+    {
+      code:
+        'doThing().then((function() { return Promise.resolve(4) }).bind(this))',
+      errors: [{ message: resolveMessage }]
+    },
+    {
+      code:
+        'doThing().then((function() { return Promise.resolve(4) }).bind(this).bind(this))',
+      errors: [{ message: resolveMessage }]
+    },
+
+    // arrow functions and other things
+    {
+      code: 'doThing().then(() => { return Promise.resolve(4) })',
+      errors: [{ message: resolveMessage }]
+    },
+
+    // issue #150
+    {
+      code: `
+      function a () {
+        return p.then(function(val) {
+          return Promise.resolve(val * 4)
+        })
+      }
+      `,
+      errors: [{ message: resolveMessage }]
+    }
   ]
 })
diff --git a/rules/no-return-wrap.js b/rules/no-return-wrap.js
index 3a93f5c6..277ca99d 100644
--- a/rules/no-return-wrap.js
+++ b/rules/no-return-wrap.js
@@ -10,10 +10,29 @@ const getDocsUrl = require('./lib/get-docs-url')
 const isPromise = require('./lib/is-promise')
 
 function isInPromise(context) {
-  const expression = context
+  let functionNode = context
     .getAncestors()
-    .filter(node => node.type === 'ExpressionStatement')[0]
-  return expression && expression.expression && isPromise(expression.expression)
+    .filter(node => {
+      return (
+        node.type === 'ArrowFunctionExpression' ||
+        node.type === 'FunctionExpression'
+      )
+    })
+    .reverse()[0]
+  while (
+    functionNode &&
+    functionNode.parent &&
+    functionNode.parent.type === 'MemberExpression' &&
+    functionNode.parent.object === functionNode &&
+    functionNode.parent.property.type === 'Identifier' &&
+    functionNode.parent.property.name === 'bind' &&
+    functionNode.parent.parent &&
+    functionNode.parent.parent.type === 'CallExpression' &&
+    functionNode.parent.parent.callee === functionNode.parent
+  ) {
+    functionNode = functionNode.parent.parent
+  }
+  return functionNode && functionNode.parent && isPromise(functionNode.parent)
 }
 
 module.exports = {