diff --git a/tcl/target/icepick.cfg b/tcl/target/icepick.cfg
index 13a6a5106..3a0afdef2 100644
--- a/tcl/target/icepick.cfg
+++ b/tcl/target/icepick.cfg
@@ -116,8 +116,7 @@ proc icepick_d_tapenable {jrc port} {
 	icepick_c_connect $jrc
 
 	# Select the port
-	irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE
-	drscan $jrc 32 [expr 0xa0002108 + ($port << 24)] -endstate DRPAUSE
+	icepick_c_router $jrc 1 0x2 $port 0x2108
 
 	# Set 4 bit core ID to the Cortex-A
 	irscan $jrc [CONST IR_ROUTER] -endstate IRPAUSE