diff --git a/Arduino.mk b/Arduino.mk
index 5a04506..fcafe46 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1733,7 +1733,7 @@ do_upload:
 
 do_sam_upload:  $(TARGET_BIN) verify_size
 ifeq ($(findstring openocd, $(strip $(UPLOAD_TOOL))), openocd)
-		$(OPENOCD) $(OPENOCD_OPTS) -c "telnet_port disabled; program {{$(TARGET_BIN)}} verify reset $(BOOTLOADER_SIZE); shutdown"
+		$(OPENOCD) $(OPENOCD_OPTS) -c "telnet_port disabled; program $(TARGET_BIN) verify reset $(BOOTLOADER_SIZE); shutdown"
 else ifeq ($(findstring bossac, $(strip $(UPLOAD_TOOL))), bossac)
 		$(BOSSA) $(BOSSA_OPTS) $(TARGET_BIN)
 else ifeq ($(findstring gdb, $(strip $(UPLOAD_TOOL))), gdb)
diff --git a/OpenCR.mk b/OpenCR.mk
index da97dc8..37833d3 100644
--- a/OpenCR.mk
+++ b/OpenCR.mk
@@ -3,6 +3,7 @@
 # Support for Robotis OpenCR boards 
 #
 # Written by Dowhan Jeong, EunJin Jeong
+# Changed by Woosuk Kang
 #
 # Based on work that is copyright Jeremy Shaw, Sudar, Nicholas Zambetti,
 # David A. Mellis & Hernando Barragan.
@@ -205,7 +206,7 @@ ifeq ($(CURRENT_OS), WINDOWS)
 else
     override AVRDUDE = $(ARDUINO_PACKAGE_DIR)/OpenCR/tools/opencr_tools/1.0.0/linux/opencr_ld
 endif
-override AVRDUDE_COM_OPTS = $(DEVICE_PATH) 
+override AVRDUDE_COM_OPTS = $(MONITOR_PORT) 
 override AVRDUDE_ISP_OPTS = 115200 $(TARGET_HEX) 1
 override AVRDUDE_ISPLOAD_OPTS =