Merge branch 'master' into 761-FixCustomMordenIndication

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7695defc..b4ea16f11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Add a check for improper Transaction data.
 - Fix bug where custom provider selection could show duplicate items.
 - Fix bug where connecting to a local morden node would make two providers appear selected.
+- Fix bug that was sometimes preventing transactions from being sent.
 
 ## 2.13.5 2016-10-18
 
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 402a5e612..27372b3e9 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -247,9 +247,9 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
   // perform static analyis on the target contract code
   function analyzeForDelegateCall(cb){
     if (txParams.to) {
-      query.getCode(txParams.to, function (err, result) {
+      query.getCode(txParams.to, (err, result) => {
         if (err) return cb(err)
-        var containsDelegateCall = this.checkForDelegateCall(result)
+        var containsDelegateCall = self.checkForDelegateCall(result)
         txData.containsDelegateCall = containsDelegateCall
         cb()
       })