diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 436c08c417698ba2bd5440326c7987cf291b1796..276fdff4e35f5a3c3721f951a44f63c0b6ed10b0 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -555,6 +555,10 @@ ivas_error ivas_jbm_dec_tc(
         st_ivas->ini_active_frame++;
     }
 
+#ifdef MASA_AND_OBJECTS
+    st_ivas->last_ivas_format = st_ivas->ivas_format;
+#endif
+
 #ifdef DEBUG_MODE_INFO
     dbgwrite( &st_ivas->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" );
     dbgwrite( &st_ivas->BER_detect, sizeof( int16_t ), 1, output_frame, "res/BER_detect" );
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 70cba6176bd35772ed1aa6ab1cdf226ffe8a60b0..7cff26a856a55b524dafd27bb7ce4aae549f293a 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -40,6 +40,7 @@
 #ifdef DEBUGGING
 #include "debug.h"
 #endif
+#include "wmc_auto.h"
 
 
 #ifdef MASA_AND_OBJECTS