diff --git a/apps/decoder.c b/apps/decoder.c
index 2588e8d3c037be52ed142b53ecb874b4721fe915..0073ad93508926ed913586bbffa91f5afa3e49e5 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -3195,7 +3195,7 @@ static ivas_error decodeVoIP(
 #ifdef SUPPORT_JBM_TRACEFILE
                 if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
 #else
-                if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
+                if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
 #endif
                 {
                     fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
diff --git a/lib_com/options.h b/lib_com/options.h
index c9aba14264dd285d378fc73f2af66d881f49796e..8242a0b719dfd0c9fdb939a15bfbe6a88a75ed0c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -40,7 +40,9 @@
 /* clang-format off */
   /* ################### Start compiler switches ######################## */
 
+#ifndef NO_SUPPORT_JBM_TRACEFILE
 #define SUPPORT_JBM_TRACEFILE                   /* support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */
+#endif
 
 /* #################### End compiler switches ######################### */