diff --git a/README.md b/README.md
index 2899e643..717cdcf7 100755
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 # Why This
 The goal of UI (user interface) automation is to reproduce cognitive interactions that you have with websites or your desktop, so that your computer can do it for you, base on your schedule or conditions. TagUI helps you rapidly automate your repetitive or time-critical tasks - use cases include process automation, data acquisition and testing of web apps.
 
-Read on for more info or jump right into the [flow samples section](https://github.com/kelaberetiv/TagUI#flow-samples) to see examples of TagUI automation in natural-language-like syntax. This is a full-feature and free open-source tool, so there's nothing to upgrade to or any paid subscription. To feedback suggestions or bugs, [raise an issue](https://github.com/kelaberetiv/TagUI/issues) or email ksoh@aisingapore.org.
+Read on for more info or jump right into the [flow samples section](https://github.com/kelaberetiv/TagUI#flow-samples) to see examples of TagUI automation in natural-language-like syntax. This is a full-feature and free open-source tool, so there's nothing to upgrade to or any paid subscription. To feedback suggestions or bugs, [raise an issue](https://github.com/kelaberetiv/TagUI/issues).
 
 <details>
   <summary>
diff --git a/src/tagui_header.js b/src/tagui_header.js
index ee84a85f..550cb333 100644
--- a/src/tagui_header.js
+++ b/src/tagui_header.js
@@ -610,7 +610,7 @@ try {var ws_json = JSON.parse(ws_message); if (ws_json.result.targetInfos) chrom
 else chrome_targets = [];} catch(e) {chrome_targets = [];} // following line scan through targets to find match
 chrome_targets.forEach(function(target) {if (target.url.search(popupInfo) !== -1) found_targetid = target.targetId;});
 if (found_targetid !== '') {var ws_message = chrome_step('Target.attachToTarget',{targetId: found_targetid});
-try {var ws_json = JSON.parse(ws_message); if (ws_json.result.sessionId.indexOf(found_targetid) > -1)
+try {var ws_json = JSON.parse(ws_message); if (ws_json.result.sessionId !== '')
 found_targetid = ws_json.result.sessionId; else found_targetid = '';} catch(e) {found_targetid = ''};}
 chrome_targetid = found_targetid;}); // set chrome_targetid only after attaching to found target successfully
 casper.then(then); casper.then(function _step() {if (chrome_targetid !== '') // detach from target after running then
diff --git a/src/test/positive_test.signature b/src/test/positive_test.signature
index 77e77fa1..99a64d70 100644
--- a/src/test/positive_test.signature
+++ b/src/test/positive_test.signature
@@ -637,7 +637,7 @@ try {var ws_json = JSON.parse(ws_message); if (ws_json.result.targetInfos) chrom
 else chrome_targets = [];} catch(e) {chrome_targets = [];} // following line scan through targets to find match
 chrome_targets.forEach(function(target) {if (target.url.search(popupInfo) !== -1) found_targetid = target.targetId;});
 if (found_targetid !== '') {var ws_message = chrome_step('Target.attachToTarget',{targetId: found_targetid});
-try {var ws_json = JSON.parse(ws_message); if (ws_json.result.sessionId.indexOf(found_targetid) > -1)
+try {var ws_json = JSON.parse(ws_message); if (ws_json.result.sessionId !== '')
 found_targetid = ws_json.result.sessionId; else found_targetid = '';} catch(e) {found_targetid = ''};}
 chrome_targetid = found_targetid;}); // set chrome_targetid only after attaching to found target successfully
 casper.then(then); casper.then(function _step() {if (chrome_targetid !== '') // detach from target after running then
@@ -1315,6 +1315,7 @@ function getTimeoutAndCheckNextStepFunction(timeout, then, methodName, defaultTi
     return timeout;
 }
 
+
 // flow path for save_text and snap_image
 var flow_path = '/full_path';