-@if "%STEP%"=="2" goto CreateUsb_FAT32_step2\r
-@echo Format %EFI_BOOT_DISK% ...\r
-@echo.> FormatCommandInput.txt\r
-@format /FS:FAT32 /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
-@del FormatCommandInput.txt\r
-@echo Create boot sector ...\r
-@%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs32.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com %BOOTSECTOR_BIN_DIR%\Bs32.com -f\r
-@del UsbBs32.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bs32.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
-@echo Done.\r
-@echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
-@goto end \r
+if "%STEP%"=="2" goto CreateUsb_FAT32_step2\r
+echo Format %EFI_BOOT_DISK% ...\r
+echo.> FormatCommandInput.txt\r
+format /FS:FAT32 /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
+del FormatCommandInput.txt\r
+echo Create boot sector ...\r
+%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o UsbBs32.com\r
+copy %BOOTSECTOR_BIN_DIR%\Bs32.com Bs32-1.com\r
+%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com Bs32-1.com -f\r
+del UsbBs32.com\r
+%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs32-1.com\r
+del Bs32-1.com\r
+%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
+echo Done.\r
+echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
+goto end\r