diff --git a/apps/decoder.c b/apps/decoder.c
index 4b7bf91736bd128679b586c151b0284098323321..ce04fa923eba35a7fa6f640407d08b6ebc8579c0 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -202,11 +202,7 @@ static int16_t app_own_random( int16_t *seed );
 static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );
 #endif
 #ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
-static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, const int16_t num_subframes, ObjectEditFileReader *objectEditFileReader );
-#else
 static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );
-#endif
 #else
 static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );
 #endif
@@ -2492,11 +2488,7 @@ static ivas_error decodeG192(
 
                     /* Do object metadata editing here ... */
 #ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
-                    do_object_editing( &editableParameters, num_subframes, objectEditFileReader );
-#else
                     do_object_editing( &editableParameters, objectEditFileReader );
-#endif
 #else
                     do_object_editing( &editableParameters );
 #endif
@@ -3305,20 +3297,17 @@ static ivas_error decodeVoIP(
         }
 
 #ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+        if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )
+#else
         if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )
+#endif
         {
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
-            if ( frame * num_subframes % IVAS_MAX_PARAM_SPATIAL_SUBFRAMES == 0 )
+            if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
             {
-#endif
-                if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
-                {
-                    fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
-                    return error;
-                }
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+                fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+                return error;
             }
-#endif
         }
 #endif
 
@@ -3423,11 +3412,7 @@ static ivas_error decodeVoIP(
 
                 /* Do object metadata editing here ... */
 #ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
-                do_object_editing( &editableParameters, num_subframes, objectEditFileReader );
-#else
                 do_object_editing( &editableParameters, objectEditFileReader );
-#endif
 #else
                 do_object_editing( &editableParameters );
 #endif
@@ -3558,17 +3543,32 @@ static ivas_error decodeVoIP(
             }
         }
 
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
+#else
         if ( !arg.quietModeEnabled )
         {
             fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
         }
         vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
         frame++;
+#endif
         if ( vec_pos_update == 0 )
         {
             systemTime_ms += vec_pos_len * systemTimeInc_ms;
         }
 
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+        if ( vec_pos_update == 0 )
+        {
+            frame++;
+            if ( !arg.quietModeEnabled )
+            {
+                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
+            }
+        }
+#endif
+
 #ifdef WMOPS
         update_mem();
         update_wmops();
@@ -3732,9 +3732,6 @@ cleanup:
 static void do_object_editing(
 #ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
     IVAS_EDITABLE_PARAMETERS *editableParameters,
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
-    const int16_t num_subframes,
-#endif
     ObjectEditFileReader *objectEditFileReader )
 #else
     IVAS_EDITABLE_PARAMETERS *editableParameters )
@@ -3833,12 +3830,7 @@ static void do_object_editing(
         /* breakover object gains */
         for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
         {
-#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
-            editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( ( frame * num_subframes / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) + obj_idx * 50 ) % 250 ) / 250.0f;
-
-#else
-        editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f;
-#endif
+            editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f;
         }
 
         editableParameters->gain_bed = 0.5f;