diff --git a/lib_com/mslvq_com_fx.c b/lib_com/mslvq_com_fx.c
index aa3e4195d4dc6730ac09b6c6f160b29753f9456a..408e20dec5e0aa054fd3ea29c1c6316fb08d3616 100644
--- a/lib_com/mslvq_com_fx.c
+++ b/lib_com/mslvq_com_fx.c
@@ -1250,14 +1250,18 @@ void deindex_lvq_SHB_fx(
 
         /* find idx_leader */
         i = 1;
+#ifdef NONBE_FIX_719 
+        WHILE( index > table_no_cv[i] )
+#else
         WHILE (index >= table_no_cv[i])
+#endif
         {
             i++;
         }
         i = i - 1;
 
         decode_comb_fx((Word32)(index - table_no_cv[i] - 1), out, i);
-
+        
         scale = p_scales[idx_scale];
         FOR (i = 0; i < LATTICE_DIM; i++)
         {
diff --git a/lib_com/options.h b/lib_com/options.h
index 5f23bf45b1d2800619d13bec30a3808daf62e644..d500aebacf94d66fc067348f09c5b8b947f89246 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -98,6 +98,7 @@
 #define FIX_TMP_714
 #define BASOP_NOGLOB_TMP_715
 #define EVS_FUNC_MODIFIED
+#define NONBE_FIX_719                                         /* Nokia: fix in decoding MSLVQ index in SHB */
 //#define DEBUGGING
 //#define DBG_WAV_WRITER
 #define EVS_FLOAT