diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0691820c6..db4a222a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
         # integer overflow).
       - name: test & coverage report creation
         run: |
+          cd cmd/legacydump && go build -o legacydump main.go && cd ../..
           go test ./... -mod=readonly -timeout 10m -short -race -coverprofile=coverage.txt -covermode=atomic
           go test ./... -mod=readonly -timeout 15m
           GOARCH=386 go test ./... -mod=readonly -timeout 15m
diff --git a/.gitignore b/.gitignore
index 7fff5ca4f..28f008576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+cmd/legacydump/legacydump
 vendor
 .glide
 *.swp
diff --git a/Makefile b/Makefile
index 7eb7e6ff8..1a2d937e7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,12 @@ test-short:
 	@go test ./... $(LDFLAGS) -v --race --short
 .PHONY: test-short
 
-test:
+cmd/legacydump/legacydump: 
+	cd cmd/legacydump && go build -o legacydump main.go
+
+test: cmd/legacydump/legacydump
 	@echo "--> Running go test"
-	@go test ./... $(LDFLAGS) -v 
+	@go test ./... $(LDFLAGS) 
 .PHONY: test
 
 format:
diff --git a/cmd/legacydump/legacydump b/cmd/legacydump/legacydump
deleted file mode 100755
index 9992570af..000000000
Binary files a/cmd/legacydump/legacydump and /dev/null differ
diff --git a/mutable_tree.go b/mutable_tree.go
index 16e40b89b..259b069ba 100644
--- a/mutable_tree.go
+++ b/mutable_tree.go
@@ -154,7 +154,6 @@ func (tree *MutableTree) WorkingVersion() int64 {
 	version := tree.version + 1
 	if version == 1 && tree.initialVersionSet {
 		version = int64(tree.ndb.opts.InitialVersion)
-		tree.initialVersionSet = false
 	}
 	return version
 }
@@ -714,6 +713,7 @@ func (tree *MutableTree) UnsetCommitting() {
 // the tree. Returns the hash and new version number.
 func (tree *MutableTree) SaveVersion() ([]byte, int64, error) {
 	version := tree.WorkingVersion()
+	tree.initialVersionSet = false
 
 	if tree.VersionExists(version) {
 		// If the version already exists, return an error as we're attempting to overwrite.