diff --git a/lib_com/options.h b/lib_com/options.h
index c096f383c16f6839e38483d2c242125cb51a1409..c9ceb68663b6b7af99b60aa7c97c294a0dec9049 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -164,7 +164,7 @@
 #define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */
 #define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */
 #define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */
-#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */
+#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index c3c3252aaed0087ad1cc16764240091c38c4ad1e..ac80143c3ebf34328af023600d354a0762c485ff 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -2327,12 +2327,6 @@ ivas_error ivas_init_decoder(
         set_f( st_ivas->mem_hp20_out[i], 0.0f, L_HP20_MEM );
     }
 
-#ifdef FIX_1585_ASAN_FORMAT_SW_ALT
-    for ( ; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
-    {
-        st_ivas->mem_hp20_out[i] = NULL;
-    }
-#endif
 
     /*-------------------------------------------------------------------*
      * Allocate and initialize rendering handles
@@ -2905,6 +2899,9 @@ void ivas_initialize_handles_dec(
     for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
     {
         st_ivas->p_output_f[i] = NULL;
+#ifdef FIX_1585_ASAN_FORMAT_SW_ALT
+        st_ivas->mem_hp20_out[i] = NULL;
+#endif
     }
 
     return;