diff --git a/cmd/state/commands/check_change_sets.go b/cmd/state/commands/check_change_sets.go
index 3c0499c48..42b493dc6 100644
--- a/cmd/state/commands/check_change_sets.go
+++ b/cmd/state/commands/check_change_sets.go
@@ -64,7 +64,11 @@ func CheckChangeSets(genesis *core.Genesis, blockNum uint64, chaindata string, h
 		interruptCh <- true
 	}()
 
-	chainDb := ethdb.MustOpen(chaindata)
+	kv, err := ethdb.NewMDBX().Path(chaindata).Open()
+	if err != nil {
+		return err
+	}
+	chainDb := ethdb.NewObjectDatabase(kv)
 	defer chainDb.Close()
 	historyDb := chainDb
 	if chaindata != historyfile {
@@ -113,7 +117,11 @@ func CheckChangeSets(genesis *core.Genesis, blockNum uint64, chaindata string, h
 		if err != nil {
 			return err
 		}
-		block := rawdb.ReadBlock(rwtx, blockHash, blockNum)
+		var block *types.Block
+		block, _, err = rawdb.ReadBlockWithSenders(rwtx, blockHash, blockNum)
+		if err != nil {
+			return err
+		}
 		if block == nil {
 			break
 		}