diff --git a/Visual Studio Projects/BuildROMs.vcproj b/Visual Studio Projects/BuildROMs.vcproj
index 64c95129..d1967e99 100644
--- a/Visual Studio Projects/BuildROMs.vcproj
+++ b/Visual Studio Projects/BuildROMs.vcproj
@@ -35,6 +35,9 @@
+
@@ -95,6 +98,8 @@
/>
+
@@ -178,6 +186,8 @@
/>
diff --git a/Visual Studio Projects/Pre-Build-Event.cmd b/Visual Studio Projects/Pre-Build-Event.cmd
index 5e616330..1f938fe2 100644
--- a/Visual Studio Projects/Pre-Build-Event.cmd
+++ b/Visual Studio Projects/Pre-Build-Event.cmd
@@ -123,8 +123,8 @@ if not "%_X_LIBPCRE%" == "" set _X_BUILD=BUILD
:_do_rom
-if "%_X_ROM%" == "" goto _done_rom
pushd ..
+if "%_X_ROM%" == "" goto _done_rom
SET _BLD=
if exist BIN\NT\Win32-Debug\BuildROMs.exe SET _BLD=BIN\NT\Win32-Debug\BuildROMs.exe
if exist BIN\NT\Win32-Release\BuildROMs.exe SET _BLD=BIN\NT\Win32-Release\BuildROMs.exe
@@ -136,8 +136,13 @@ if "%_BLD%" == "" echo ************************************************
if "%_BLD%" == "" echo ************************************************
if "%_BLD%" == "" exit 1
%_BLD%
+if not errorlevel 1 goto _done_rom
+if not exist "BIN\NT\Win32-Release\BuildROMs.exe" exit 1
+del "BIN\NT\Win32-Release\BuildROMs.exe"
popd
+goto _do_rom
:_done_rom
+popd
:_check_build
if "%_X_BUILD%" == "" goto _done_build