diff --git a/bip-0158/gentestvectors.go b/bip-0158/gentestvectors.go
index bf6d9a741e..686217f9fd 100644
--- a/bip-0158/gentestvectors.go
+++ b/bip-0158/gentestvectors.go
@@ -290,12 +290,10 @@ func main() {
 				fmt.Println("Error writing test case to output: ", err.Error())
 				return
 			}
-		}
-
-		prevBasicHeader = basicHeader
 
-		if uint32(height) == testBlockHeights[testBlockIndex].height {
 			testBlockIndex++
 		}
+
+		prevBasicHeader = basicHeader
 	}
 }