diff --git a/lib_com/env_stab.c b/lib_com/env_stab.c
index b4da4ce9d70d675dc0de77f32c6d1ca061ede6d5..e1acf8e9526e3a253526a9129db5f48f6ad0f79b 100644
--- a/lib_com/env_stab.c
+++ b/lib_com/env_stab.c
@@ -92,8 +92,12 @@ float env_stability(
 #ifdef BASOP_NOGLOB
         Overflow = 0;
         env_delta = shl_o( *mem_env_delta, 1, &Overflow );
+#else
+#ifdef FIX_595_SHL_NOGLOB
+        env_delta = shl( *mem_env_delta, 1 );
 #else
         env_delta = shl_o( *mem_env_delta, 1 );
+#endif
 #endif
     }
     else
diff --git a/lib_com/options.h b/lib_com/options.h
index 0f0f0cfb5144de1937599792f6269e529eae71f8..3a42a2319c79eeb97a7f8abe6adc99221b8bcf48 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -175,6 +175,7 @@
 #define FIX_569_TD_FILTER_LENGTH                        /* Eri: Issue 569: If an HRTF binary file exceeds the SFX_SPAT_BIN_MAX_FILTER_LENGTH the decoder crashes. This truncates the filter when generated from the model.  */
 #define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */
 #define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */
+#define FIX_595_SHL_NOGLOB                              /* FhG: Issue 595: compilation with BASOP_NOGLOB disabled */
 #define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */
 #define FIX_570_SF_EXT_ORIENTATION
 #define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
@@ -214,7 +215,6 @@
 /* ##################### End NON-BE CR switches ########################### */
 
 
-
 /* ################## End DEVELOPMENT switches ######################### */
 
 /* clang-format on */