diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index fe6ec0c..4408aa2 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="806218715428114" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1446236912834954" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/sa_core.c b/sa_core.c
index 7b7ce91..3a2fd8c 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -624,16 +624,16 @@ void toggle_AGC(void)
 void auto_set_AGC_LNA(int auto_set)                                                                    // Adapt the AGC setting if needed
 {
 #ifdef __SI4432__
-  static unsigned char old_v;
+  static unsigned char old_v[2];
   unsigned char v;
   if (auto_set)
     v = 0x60; // Enable AGC and disable LNA
   else
-    v = 0x40; // Disable AGC and enable LNA
-  if (old_v != v) {
-    SI4432_Sel = SI4432_RX ;
+    v = 0x50; // Disable AGC and enable LNA
+  if (old_v[MODE_SELECT(setting.mode)] != v) {
+    SI4432_Sel = MODE_SELECT(setting.mode);
     SI4432_Write_Byte(SI4432_AGC_OVERRIDE, v);
-    old_v = v;
+    old_v[MODE_SELECT(setting.mode)] = v;
   }
 #endif
 }
@@ -1676,7 +1676,7 @@ modulation_again:
 
       set_freq (2, IF_2 + lf);                 // Scanning LO up to IF2
       set_freq (3, IF_2 - 433800000);          // Down from IF2 to fixed second IF in Ultra SA mode
-      set_freq (SI4432_LO, 433800000);                 // Second IF fixe in Ultra SA mode
+      set_freq (SI4432_LO, 433800000);                 // Second IF fixed in Ultra SA mode
 #else
 #ifdef __SI4432__
       if (setting.mode == M_LOW && !setting.tracking && S_STATE(setting.below_IF)) // if in low input mode and below IF
@@ -1816,6 +1816,7 @@ static bool sweep(bool break_on_operation)
 {
   float RSSI;
   int16_t downslope;
+  uint32_t peak_freq = 0;
   //  if (setting.mode== -1)
   //    return;
   //  START_PROFILE;
@@ -1864,6 +1865,19 @@ sweep_again:                                // stay in sweep loop when output mo
       return false;
     }
 
+    // ----------------------- in loop AGC ---------------------------------
+
+    if (!in_selftest && setting.mode == M_HIGH && S_IS_AUTO(setting.agc) && UNIT_IS_LOG(setting.unit)) {
+      if (RSSI > -55) {
+        peak_freq = frequencies[i];
+      }
+      if (peak_freq != 0 && frequencies[i] - peak_freq < 1700000)
+        auto_set_AGC_LNA(false);
+      else
+        auto_set_AGC_LNA(TRUE);
+    }
+
+
     // Delay between points if needed, (all delays can apply in SI4432 fill)
     if (setting.measure_sweep_time_us == 0){                                    // If not already in buffer
       if (setting.additional_step_delay_us && (MODE_INPUT(setting.mode) || setting.modulation == MO_NONE)) {     // No delay when modulation is active
@@ -2090,12 +2104,15 @@ sweep_again:                                // stay in sweep loop when output mo
 
   // ----------------------------------  auto AGC ----------------------------------
 
-  if (!in_selftest && MODE_INPUT(setting.mode) && S_IS_AUTO(setting.agc) && UNIT_IS_LINEAR(setting.unit)) { // Auto AGC in linear mode
+
+  if (!in_selftest && MODE_INPUT(setting.mode) && S_IS_AUTO(setting.agc)) {
     float actual_max_level = actual_t[max_index[0]] - get_attenuation();
-    if (actual_max_level > - 45)
-      auto_set_AGC_LNA(false);
-    else
-      auto_set_AGC_LNA(TRUE);
+    if (UNIT_IS_LINEAR(setting.unit)) { // Auto AGC in linear mode
+      if (actual_max_level > - 45)
+        auto_set_AGC_LNA(false);
+      else
+        auto_set_AGC_LNA(TRUE);
+    }
   }