diff --git a/lib_com/options.h b/lib_com/options.h
index 30b76461a1e09a1276d57d55c9b6135b46f04111..e9dd15dd40e85320d47b7478a82fdf2653f0df0d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -89,6 +89,7 @@
 #define FIX_2252_SCALING_SAVE_HB_SYNTH                  /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */
 #define FIX_2248_EVS_ASSERT                             /* VA: Include _sat in an EVS related part of the code */
 #define FIX_2254_IMPROV_COMPLEXITY_BE                   /* VA: BE small complexity reduction  */
+#define FIX_1464_UBSAN_RC_CONTEXT_MAP                   /* FhG: BE UBSAN fix for float issue 1464 in the TCX range coder */
 #define FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH         /* FhG: fix OOB index USAN error in TCX LTP pitch search */
 #define FIX_2274_OOB_INDEXING_IN_CORRMATRIX             /* FhG: fix OOB indexing complaint */
 #define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */
diff --git a/lib_dec/ACcontextMapping_dec_fx.c b/lib_dec/ACcontextMapping_dec_fx.c
index 60269751b1da0ff3c090390a467677449519fc6d..e88d96aa686ee1cba56bbe7b28315e6c4385fb75 100644
--- a/lib_dec/ACcontextMapping_dec_fx.c
+++ b/lib_dec/ACcontextMapping_dec_fx.c
@@ -614,6 +614,7 @@ Word16 RCcontextMapping_decode2_no_mem_s17_LCS_fx(
         move16();
         s = 0;
         move16();
+
         /* Main Loop through the 2-tuples */
         FOR( k = 0; k < lastnz; k += 2 )
         {
@@ -701,9 +702,15 @@ Word16 RCcontextMapping_decode2_no_mem_s17_LCS_fx(
                 c = add( 12, esc_nb );
             }
 
+#ifdef FIX_1464_UBSAN_RC_CONTEXT_MAP
+            s = shl( s_and( s, 0x0F ), 4 ); /*Shift old 4 bits*/
+            s = add( s, c );                /*replace last 4 bits*/
+            t = s_and( s, 0xFF );
+#else
             s = (UWord16) L_shl( s, 4 ); /*Shift old 4 bits*/
             s = (UWord16) L_add( s, c ); /*replace last 4 bits*/
             t = (UWord16) L_and( s, 0xFF );
+#endif
         }
 
         /* Decode signs */
diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c
index 91edc47a5bf9fadfcd14628755e9408acf72c9b9..2d2ad83b1b5da91e0cac8d59e5d50982cb26a145 100644
--- a/lib_enc/ACcontextMapping_enc_fx.c
+++ b/lib_enc/ACcontextMapping_enc_fx.c
@@ -1099,8 +1099,13 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
             }
 
             /*Shift old 4 bits, replace last 4 bits*/
+#ifdef FIX_1464_UBSAN_RC_CONTEXT_MAP
+            s = add( shl( s_and( s, 0x0F ), 4 ), cp );
+            t = s_and( s, 0xFF );
+#else
             s = (UWord16) ( L_add( L_shl( s, 4 ), cp ) );
             t = (UWord16) L_and( s, 0xFF );
+#endif
 
         } /*end of the 2-tuples loop*/
     }
@@ -1564,8 +1569,13 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
                 cp = add( 12, esc_nb ); /* Q0 */
             }
             /*shift old bits and replace last 4 bits*/
+#ifdef FIX_1464_UBSAN_RC_CONTEXT_MAP
+            s = add( shl( s_and( s, 0x0F ), 4 ), cp );
+            t = s_and( s, 0xFF );
+#else
             s = (UWord16) L_add( L_shl( s, 4 ), cp );
             t = s_and( s, 0xFF );
+#endif
         } /*end of the 2-tuples loop*/
 
         tot_bits2 = round_fx( W_shl_sat_l( nbits2_fx, -Q7 ) );                   /* Q23 -> Q16 -> Q0 */