diff --git a/src/platforms/hosted/cmsis_dap.c b/src/platforms/hosted/cmsis_dap.c
index 60a0415..c955761 100644
--- a/src/platforms/hosted/cmsis_dap.c
+++ b/src/platforms/hosted/cmsis_dap.c
@@ -51,6 +51,7 @@ static int report_size = 512 + 1; // TODO: read actual report size
 /* LPC845 Breakout Board Rev. 0 report invalid response with > 65 bytes */
 int dap_init(bmp_info_t *info)
 {
+	printf("dap_init\n");
 	if (hid_init())
 		return -1;
 	int size = strlen(info->serial);
diff --git a/src/platforms/hosted/platform.c b/src/platforms/hosted/platform.c
index 721bccf..2b63959 100644
--- a/src/platforms/hosted/platform.c
+++ b/src/platforms/hosted/platform.c
@@ -162,6 +162,8 @@ static int find_debuggers(	BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info)
 		if ((desc.idVendor == VENDOR_ID_BMP) &&
 			(desc.idProduct == PRODUCT_ID_BMP)) {
 			type = BMP_TYPE_BMP;
+		} else if ((strstr(manufacturer, "CMSIS")) || (strstr(product, "CMSIS"))) {
+			type = BMP_TYPE_CMSIS_DAP;
 		} else if (desc.idVendor ==  VENDOR_ID_STLINK) {
 			if ((desc.idProduct == PRODUCT_ID_STLINKV2) ||
 				(desc.idProduct == PRODUCT_ID_STLINKV21) ||
@@ -174,8 +176,6 @@ static int find_debuggers(	BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info)
 					DEBUG_WARN( "INFO: STLINKV1 not supported\n");
 				continue;
 			}
-		} else if ((strstr(manufacturer, "CMSIS")) || (strstr(product, "CMSIS"))) {
-			type = BMP_TYPE_CMSIS_DAP;
 		} else if (desc.idVendor ==  VENDOR_ID_SEGGER) {
 			type = BMP_TYPE_JLINK;
 		} else{