diff --git a/lib_com/options.h b/lib_com/options.h
old mode 100755
new mode 100644
index 98d82829db5f255e2d2e28307de76e8d32543852..00b3446f52721feb4d3dfdd5869e528275fb542b
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -181,6 +181,7 @@
 #define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */
 #define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */
 #define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */
+#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */
 /* ##################### End NON-BE switches ########################### */
 
 /* ################## End DEVELOPMENT switches ######################### */
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c
index c211bea57552461b31c6d0ebea934ebbe96c6be3..3984b79c54c933cde9a8a65aa05bfd8dc7feaf52 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec.c
@@ -142,6 +142,13 @@ ivas_error ivas_masa_decode(
         st->next_bit_pos = (int16_t) ( ( masa_brate / FRAMES_PER_SEC ) - 1 );
     }
 
+#ifdef NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS
+    if ( ivas_format == MASA_FORMAT && ( masa_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )
+    {
+        hMasa->config.numberOfDirections = 1;
+    }
+#endif
+
     if ( !st->bfi && ivas_total_brate > IVAS_SID_5k2 )
     {
         if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )