diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index 52c89794e0c2e4dd36734da6e9f55a0c60ae0d8c..17cd5964cf1266f94b07c8a423099c319990075f 100755
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -780,11 +780,19 @@ int16_t get_ivas_max_num_indices_metadata(                                /* o
         }
         else if ( ivas_total_brate <= IVAS_384k )
         {
+#ifdef FIX_509
+            return 2000;
+#else
             return 1500;
+#endif
         }
         else
         {
+#ifdef FIX_509
+            return 2500;
+#else
             return 2000;
+#endif
         }
     }
     else if ( ivas_format == MASA_FORMAT )
diff --git a/lib_com/options.h b/lib_com/options.h
index c373d562ab208986f30753889360a1360c78e930..c0f9011de9213c900b7f49dfdc95b4580b9a3f01 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -225,6 +225,9 @@
 #define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */
 #define FIX_170_DTX_MASA                                /* Nokia: Fix issue 170, relaxing the use of DTX in MASA format */
 
+#define FIX_509                                         /* FhG: fix issue 509, too low number of bitsream indices in SBA */
+
+
                                                         /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */