diff --git a/lib_com/options.h b/lib_com/options.h
index ee7d3b168d2ac849431cca3b4d6f61c7ee0318df..03e3ca8b66da1f575988f35e874d4ee73a1d0b4f 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -71,8 +71,8 @@
 #define BASOP_NOGLOB_DECLARE_LOCAL
 #endif
 
+/* ################### Start FIXES switches ########################### */
 /* Note: each compile switch (FIX_1101_...) is independent from the other ones */
-
 #define FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW                /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 2166 */
 #define ISSUE_1836_replace_overflow_libcom                   /* FhG: BE - replace overflow operators by non-overflow-alternatives in lib_com */
 #define ISSUE_1867_replace_overflow_libenc                   /* FhG: BE - replace overflow operators by non-overflow-alternatives all over the lib_enc module */
@@ -114,6 +114,12 @@
 
 #define FIX_2083_FLOATING_POINT_LEFTOVERS                    /* FhG: convert floating-point leftovers in makeCustomLsSetup()*/
 #define FIX_2085_FLOATING_POINT_LEFTOVERS                    /* FhG: convert floating-point leftovers in ivas_dirac_config_fx() */
+#define FIX_1984_SAT_IN_PSYCHAD                              /* VA: Issue 1984: proposal to fix an assert */
+#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK            /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
+
+/* #################### End FIXES switches ############################ */
+
+
 /* #################### Start BASOP porting switches ############################ */
 
 #define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
@@ -122,7 +128,6 @@
 #define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0, float issue 1328  */
 #define FIX_1319_STACK_SBA_DECODER                      /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */
 #define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */
-#define FIX_1984_SAT_IN_PSYCHAD                         /* VA: Issue 1984: proposal to fix an assert */
 #define NONBE_FIX_1261_MASA_EXT_META_JBM                /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */
 #define NONBE_FIX_1143_MASA_BRSW                        /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */
 #define NONBE_FIX_1220_OMASA_JBM_EXT_USAN               /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */
@@ -130,7 +135,6 @@
 #define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */
 #define FIX_CREND_SIMPLIFY_CODE   
 #ifdef FIX_CREND_SIMPLIFY_CODE
-#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */
 #define USE_REVERB_16BIT_ROM                            /* if desactivated old rom hrtf tables is used */
 #define USE_TDREND_16BIT_ROM                            /* if desactivated old rom hrtf tables is used.  when active some tests case with 4 ISM fail due to owerflow in round_fixed function */
 #define USE_FASTCONV_PARAMBIN_16BIT_ROM                 /* if desactivated old rom hrtf tables is used */
@@ -138,7 +142,6 @@
 #endif
 #define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */
 #define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */
-#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
 #define FIX_1053_REVERB_RECONFIGURATION
 #define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
 #define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */