diff --git a/fpga/mqnic/VCU118/fpga_100g/fpga/Makefile b/fpga/mqnic/VCU118/fpga_100g/fpga/Makefile
index 88270f85a..da12d2620 100644
--- a/fpga/mqnic/VCU118/fpga_100g/fpga/Makefile
+++ b/fpga/mqnic/VCU118/fpga_100g/fpga/Makefile
@@ -153,6 +153,7 @@ include ../common/vivado.mk
 	EXT=bit; COUNT=100; \
 	while [ -e rev/$*_rev$$COUNT.$$EXT ]; \
 	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
 	cp $@ rev/$*_fallback_rev$$COUNT.$$EXT; \
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
@@ -253,4 +254,3 @@ flash%: $(FPGA_TOP)%_primary.mcs $(FPGA_TOP)%_secondary.mcs $(FPGA_TOP)%_primary
 	echo "boot_hw_device [current_hw_device]" >> flash$*.tcl
 	echo "exit" >> flash$*.tcl
 	vivado -nojournal -nolog -mode batch -source flash$*.tcl
-
diff --git a/fpga/mqnic/VCU118/fpga_100g/fpga_app_dma_bench/Makefile b/fpga/mqnic/VCU118/fpga_100g/fpga_app_dma_bench/Makefile
index 941adb93e..5bb1362c7 100644
--- a/fpga/mqnic/VCU118/fpga_100g/fpga_app_dma_bench/Makefile
+++ b/fpga/mqnic/VCU118/fpga_100g/fpga_app_dma_bench/Makefile
@@ -164,6 +164,7 @@ include ../common/vivado.mk
 	EXT=bit; COUNT=100; \
 	while [ -e rev/$*_rev$$COUNT.$$EXT ]; \
 	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
 	cp $@ rev/$*_fallback_rev$$COUNT.$$EXT; \
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
@@ -264,4 +265,3 @@ flash%: $(FPGA_TOP)%_primary.mcs $(FPGA_TOP)%_secondary.mcs $(FPGA_TOP)%_primary
 	echo "boot_hw_device [current_hw_device]" >> flash$*.tcl
 	echo "exit" >> flash$*.tcl
 	vivado -nojournal -nolog -mode batch -source flash$*.tcl
-
diff --git a/fpga/mqnic/VCU118/fpga_25g/fpga/Makefile b/fpga/mqnic/VCU118/fpga_25g/fpga/Makefile
index fdb0db496..13fb47770 100644
--- a/fpga/mqnic/VCU118/fpga_25g/fpga/Makefile
+++ b/fpga/mqnic/VCU118/fpga_25g/fpga/Makefile
@@ -167,6 +167,7 @@ include ../common/vivado.mk
 	EXT=bit; COUNT=100; \
 	while [ -e rev/$*_rev$$COUNT.$$EXT ]; \
 	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
 	cp $@ rev/$*_fallback_rev$$COUNT.$$EXT; \
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
@@ -267,4 +268,3 @@ flash%: $(FPGA_TOP)%_primary.mcs $(FPGA_TOP)%_secondary.mcs $(FPGA_TOP)%_primary
 	echo "boot_hw_device [current_hw_device]" >> flash$*.tcl
 	echo "exit" >> flash$*.tcl
 	vivado -nojournal -nolog -mode batch -source flash$*.tcl
-
diff --git a/fpga/mqnic/VCU118/fpga_25g/fpga_10g/Makefile b/fpga/mqnic/VCU118/fpga_25g/fpga_10g/Makefile
index fdb0db496..13fb47770 100644
--- a/fpga/mqnic/VCU118/fpga_25g/fpga_10g/Makefile
+++ b/fpga/mqnic/VCU118/fpga_25g/fpga_10g/Makefile
@@ -167,6 +167,7 @@ include ../common/vivado.mk
 	EXT=bit; COUNT=100; \
 	while [ -e rev/$*_rev$$COUNT.$$EXT ]; \
 	do COUNT=$$((COUNT+1)); done; \
+	COUNT=$$((COUNT-1)); \
 	cp $@ rev/$*_fallback_rev$$COUNT.$$EXT; \
 	echo "Output: rev/$*_fallback_rev$$COUNT.$$EXT";
 
@@ -267,4 +268,3 @@ flash%: $(FPGA_TOP)%_primary.mcs $(FPGA_TOP)%_secondary.mcs $(FPGA_TOP)%_primary
 	echo "boot_hw_device [current_hw_device]" >> flash$*.tcl
 	echo "exit" >> flash$*.tcl
 	vivado -nojournal -nolog -mode batch -source flash$*.tcl
-