diff --git a/AUTHORS b/AUTHORS
index b76564bea..9e174fcb3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,4 @@ Magnus Lundin <lundin@mlu.mine.nu>
 Michael Fischer <fischermi@t-online.de>
 Spencer Oliver <spen@spen-soft.co.uk>
 Carsten Schlote <schlote@vahanus.net>
+Øyvind Harboe <oyvind.harboe@zylin.com>
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index f87f37a5e..edc1bd880 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -86,7 +86,7 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
 	if(jtag_info->cur_scan_chain != new_scan_chain)
 	{
 #ifdef _ARM_JTAG_SCAN_N_CHECK_
-		u8 scan_n_check_value = 0x10;
+		u8 scan_n_check_value = 1 << (jtag_info->scann_size - 1);
 #endif
 		scan_field_t field;