diff --git a/CHANGES b/CHANGES
index c68a701390..b2bee1988b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+7.1.0-dev.645 | 2024-12-02 10:59:04 +0100
+
+  * fixed -O dump-final-ZAM to work in conjunction with -O no-ZAM-opt (Vern Paxson, Corelight)
+
 7.1.0-dev.643 | 2024-12-02 09:51:10 +0100
 
   * Remove support for building against Spicy versions before 1.8 (Benjamin Bannier, Corelight)
diff --git a/VERSION b/VERSION
index 21719b73fe..0de602d1aa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.0-dev.643
+7.1.0-dev.645
diff --git a/src/script_opt/ZAM/Driver.cc b/src/script_opt/ZAM/Driver.cc
index a4be8b9d83..1cb8abfdd7 100644
--- a/src/script_opt/ZAM/Driver.cc
+++ b/src/script_opt/ZAM/Driver.cc
@@ -404,16 +404,19 @@ void ZAMCompiler::Dump() {
         }
     }
     else if ( analysis_options.dump_final_ZAM ) {
-        ASSERT(remapped_frame);
-
         printf("\nFrame for %s:\n", func->GetName().c_str());
 
-        for ( auto i = 0U; i < shared_frame_denizens.size(); ++i ) {
-            printf("frame[%d] =", i);
-            for ( auto& id : shared_frame_denizens[i].ids )
-                printf(" %s", id->Name());
-            printf("\n");
+        if ( remapped_frame ) {
+            for ( auto i = 0U; i < shared_frame_denizens.size(); ++i ) {
+                printf("frame[%d] =", i);
+                for ( auto& id : shared_frame_denizens[i].ids )
+                    printf(" %s", id->Name());
+                printf("\n");
+            }
         }
+        else
+            for ( const auto& elem : frame_layout1 )
+                printf("frame[%d] = %s\n", elem.second, elem.first->Name());
     }
 
     if ( ! insts2.empty() )