diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 4960db4712d21ea43b05909befe931db6481ec88..b9e6c2cfda3dab838fccde7956e0ef7733c2e533 100755
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -1195,7 +1195,11 @@ enum
 #define MASA_COHERENCE_TOLERANCE                0.1f
 #define MASA_COHERENCE_THRESHOLD                0.1f
 #define MASA_RATIO_TOLERANCE                    0.1f
+#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS
+#define MASA_RATIO_THRESHOLD                    0.015f
+#else
 #define MASA_RATIO_THRESHOLD                    0.1f
+#endif
 #define MASA_ANGLE_TOLERANCE                    0.5f
 #define MASA_LIMIT_NO_BANDS_SUR_COH             8
 #define MINIMUM_BIT_BUDGET_NORMAL_META          100
diff --git a/lib_com/options.h b/lib_com/options.h
index e0c9fae45c84f33749d2fbfd62d5c70505624f80..f028b6341148766b3f1206051e2ddfe1a6dce704 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -166,7 +166,8 @@
 /* any switch which is non-be wrt selection floating point code */
 /* all switches in this category should start with "NONBE_" */
 
-#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                      /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/
+#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/
+#define NONBE_FIX_1034_DRY_MASA_RATIOS                  /* Nokia: Fix issue 1034, use of wrong numDir state. */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c
index 831e343d72e82fdb602ba693da404b4c8104a345..466287a0fd0e0a915c3daf32de5d7da399bcea8f 100644
--- a/lib_enc/ivas_masa_enc.c
+++ b/lib_enc/ivas_masa_enc.c
@@ -1260,6 +1260,9 @@ void ivas_masa_combine_directions(
                 ambience2dir = 1.0f - ratioSum;
                 hMeta->directional_meta[0].energy_ratio[j][i] = sumVecLen[j][i] / ( hMeta->directional_meta[0].energy_ratio[j][i] + hMeta->directional_meta[1].energy_ratio[j][i] + ambience2dir / 2.0f );
                 hMeta->directional_meta[1].energy_ratio[j][i] = 0.0f;
+#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS
+                hMeta->common_meta.diffuse_to_total_ratio[j][i] = 1.0f - hMeta->directional_meta[0].energy_ratio[j][i];
+#endif
                 if ( computeCoherence )
                 {
                     ambience1dir = 1.0f - hMeta->directional_meta[0].energy_ratio[j][i];
@@ -1448,6 +1451,9 @@ static void detect_metadata_composition(
             {
                 for ( band = 0; band < MASA_FREQUENCY_BANDS; band++ )
                 {
+#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS
+                    hMeta->directional_meta[0].spherical_index[sf][band] = hMeta->directional_meta[1].spherical_index[sf][band];
+#endif
                     hMeta->directional_meta[0].azimuth[sf][band] = hMeta->directional_meta[1].azimuth[sf][band];
                     hMeta->directional_meta[0].elevation[sf][band] = hMeta->directional_meta[1].elevation[sf][band];
                     hMeta->directional_meta[0].energy_ratio[sf][band] = hMeta->directional_meta[1].energy_ratio[sf][band];
@@ -1524,7 +1530,11 @@ static void compensate_energy_ratios(
     uint8_t numDirs;
 
     hMeta = &( hMasa->masaMetadata );
+#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS
+    numDirs = hMasa->config.numberOfDirections;
+#else
     numDirs = hMeta->descriptive_meta.numberOfDirections + 1;
+#endif
 
     for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
     {
@@ -2140,10 +2150,19 @@ static void copy_masa_metadata_subframe(
 )
 {
     uint8_t dir;
+#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS
+    uint8_t band;
+#endif
 
     /* directional metadata */
     for ( dir = 0; dir < MASA_MAXIMUM_DIRECTIONS; dir++ )
     {
+#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS
+        for ( band = 0; band < MASA_FREQUENCY_BANDS; band++ )
+        {
+            hMetaTo->directional_meta[dir].spherical_index[sfTo][band] = hMetaFrom->directional_meta[dir].spherical_index[sfFrom][band];
+        }
+#endif
         mvr2r( hMetaFrom->directional_meta[dir].azimuth[sfFrom], hMetaTo->directional_meta[dir].azimuth[sfTo], MASA_FREQUENCY_BANDS );
         mvr2r( hMetaFrom->directional_meta[dir].elevation[sfFrom], hMetaTo->directional_meta[dir].elevation[sfTo], MASA_FREQUENCY_BANDS );
         mvr2r( hMetaFrom->directional_meta[dir].energy_ratio[sfFrom], hMetaTo->directional_meta[dir].energy_ratio[sfTo], MASA_FREQUENCY_BANDS );