diff --git a/CMSIS-DAP2mod/STM32/CMSIS-DAP.c b/CMSIS-DAP2mod/STM32/CMSIS-DAP.c
index efa0ed0..26d4612 100644
--- a/CMSIS-DAP2mod/STM32/CMSIS-DAP.c
+++ b/CMSIS-DAP2mod/STM32/CMSIS-DAP.c
@@ -413,8 +413,8 @@ void BoardInit(void)
 	// Enable GPIOA-GPIOC
 	RCC->APB2ENR |= (RCC_APB2ENR_AFIOEN | RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | RCC_APB2ENR_IOPCEN);
 
-	// Enable SWJ only
-	GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
+	// Full SWJ Disabled (JTAG-DP + SW-DP) 
+	GPIO_PinRemapConfig(GPIO_Remap_SWJ_Disable, ENABLE);
 
 	GPIO_INIT(GPIOA, INIT_PINS_A);
 	GPIO_INIT(GPIOB, INIT_PINS_B);
diff --git a/CMSIS-DAP2mod/STM32/DAP_config.h b/CMSIS-DAP2mod/STM32/DAP_config.h
index 9e915e4..b439284 100644
--- a/CMSIS-DAP2mod/STM32/DAP_config.h
+++ b/CMSIS-DAP2mod/STM32/DAP_config.h
@@ -256,11 +256,11 @@ typedef enum Pin_e {
 
 	// SWDIO/TMS Pin
 	#define PIN_SWDIO_TMS_PORT      GPIOA
-	#define PIN_SWDIO_TMS_PIN		2
+	#define PIN_SWDIO_TMS_PIN		13
 
 	// SWCLK/TCK Pin
 	#define PIN_SWCLK_TCK_PORT		GPIOA
-	#define PIN_SWCLK_TCK_PIN		4
+	#define PIN_SWCLK_TCK_PIN		14
 
 	// TDO/SWO Pin (input)
 	#define PIN_TDO_PORT            GPIOA