diff --git a/lib_com/options.h b/lib_com/options.h
index 30291730bffd64e876b5f1d47a931dec0608da67..97eafb65e8821b99bb135823ee0021f03646cf6f 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -99,6 +99,7 @@
 #define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
 #define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */
 #define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/
+#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */
 
 #define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */
 
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index bda6b28e2651f36455e344a192c4816fb4d6ddd8..1e233533877bad1b1533d0859b2ff4683dd64174 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -1976,9 +1976,19 @@ ivas_error ivas_jbm_dec_render_fx(
             {
                 ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );
             }
+#ifdef FIX_955_FASTCONV_REND_IN_ISM
+#ifdef DEBUGGING
+            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
+#else
+            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+#endif
+            {
+                /* Convert to Ambisonics */
+#else
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
             {
-                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
+/* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
+#endif
                 FOR( i = 0; i < st_ivas->nchan_transport; i++ )
                 {
                     FOR( j = 0; j < HOA3_CHANNELS; j++ )
@@ -1991,13 +2001,13 @@ ivas_error ivas_jbm_dec_render_fx(
                 }
 
                 ivas_ism2sba_sf_fx( st_ivas->hTcBuffer->tc_fx, p_output_fx, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );
+
                 Word16 sba_num_chans = imult1616( add( st_ivas->hIntSetup.ambisonics_order, 1 ), add( st_ivas->hIntSetup.ambisonics_order, 1 ) );
                 FOR( j = 0; j < sba_num_chans; j++ )
                 {
                     scale_sig32( p_output_fx[j], *nSamplesRendered, sub( Q11, sub( add( output_q_factor, 29 ), 31 ) ) ); // Q11
                 }
 
-
                 FOR( i = 0; i < st_ivas->nchan_transport; i++ )
                 {
                     FOR( j = 0; j < 16; j++ )
@@ -3035,7 +3045,7 @@ void ivas_jbm_dec_get_adapted_subframes(
     move16();
     Word16 temp, temp_e;
     /* get last subframe size from previous frame, determine how many slots have to be processed
-           in the first subframe (i.e. potential leftover of a 5ms subframe) */
+               in the first subframe (i.e. potential leftover of a 5ms subframe) */
     nSlotsInFirstSubframe = ( sub( PARAM_MC_MAX_NSLOTS_IN_SUBFRAME, subframe_nbslots[*nb_subframes - 1] ) );
     *nb_subframes = 0;
     move16();
@@ -3100,7 +3110,7 @@ void ivas_jbm_dec_get_md_map(
     }
 
     /* changed part (first segment), interpolate index to parameters
-           (we do not want to interpolate and smooth acutal direction/diffuseness values even more) */
+               (we do not want to interpolate and smooth acutal direction/diffuseness values even more) */
     IF( src_idx >= 0 )
     {
         dec_fx = BASOP_Util_Divide3232_Scale( L_shl( add( src_idx, 1 ), 16 ), jbm_segment_len, &temp_e );