diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 458083a1..405ca7d3 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -594,6 +594,8 @@ while read line; do
 		echo
 
 		BUILD="NO"
+		BUILD_ORIG=$BUILD
+		FORCE_ORIG=$FORCE
 
 		if [ ! -d "${DIR}/.git" ] || [ "${CLEANUP}" = "YES" ]; then
 			rm -rfv -- "$DIR"
@@ -635,9 +637,6 @@ while read line; do
 			BUILD="YES"
 		fi
 
-		FORCE_ORIG=$FORCE
-		OLDBUILD=$BUILD
-
 		for core in 81 emux_nes emux_sms fuse gw mgba; do
 			if [ "${PREVCORE}" = "$core" ] && [ "${PREVBUILD}" = "YES" ] && [ "${NAME}" = "$core" ]; then
 				FORCE="YES"
@@ -682,7 +681,7 @@ while read line; do
 	PREVCORE=$NAME
 	PREVBUILD=$BUILD
 
-	BUILD=$OLDBUILD
+	BUILD=$BUILD_ORIG
 	FORCE=$FORCE_ORIG
 done < $RECIPE