diff --git a/lib/pymakr.js b/lib/pymakr.js
index 88308b0..391de66 100644
--- a/lib/pymakr.js
+++ b/lib/pymakr.js
@@ -445,12 +445,16 @@ export default class Pymakr extends EventEmitter {
   }
 
   findDevice(address) {
-    const i = this.deviceAddresses.indexOf(address);
+    let i = this.deviceAddresses.indexOf(address);
     if (i > -1) {
       return this.devices[i];
     }
-
-    return null;
+    // PyyJTAG bug fix
+    this.deviceAddresses.forEach((device, key)=> {if (device.includes(address)) i = key });
+    if (i > -1) {
+      return this.devices[i];
+    }
+    return null
   }
 
   createDeviceIfNotExists(address) {
@@ -522,7 +526,7 @@ export default class Pymakr extends EventEmitter {
     );
     const addressArray = $.makeArray(addresses);
     const loopWithDelay = index => {
-      let finalIndex = index ? index : 0;
+      let finalIndex = index || 0;
       if (finalIndex < addressArray.length) {
         setTimeout(() => {
           addressArray[finalIndex].click();