diff --git a/src/target/jtag_scan.c b/src/target/jtag_scan.c
index 04a8cca..f35aa67 100644
--- a/src/target/jtag_scan.c
+++ b/src/target/jtag_scan.c
@@ -215,7 +215,7 @@ int jtag_scan(const uint8_t *irlens)
 				jtag_devs[i].jd_descr = dev_descr[j].descr;
 				/* Call handler to initialise/probe device further */
 				if(dev_descr[j].handler)
-					dev_descr[j].handler(i, jtag_devs[i].jd_idcode);
+					dev_descr[j].handler(i, dev_descr[i].idcode);
 				break;
 			}