diff --git a/game/data/radar_db.py b/game/data/radar_db.py
index cc92bcb1..7131223a 100644
--- a/game/data/radar_db.py
+++ b/game/data/radar_db.py
@@ -38,6 +38,7 @@ TRACK_RADARS = {
     AirDefence.Kub_1S91_str,
     AirDefence.Snr_s_125_tr,
     AirDefence.S_300PS_40B6M_tr,
+    AirDefence.S_300PS_5H63C_30H6_tr,
     AirDefence.Hawk_tr,
     AirDefence.Patriot_str,
     AirDefence.SNR_75V,
@@ -53,30 +54,36 @@ TRACK_RADARS = {
 }
 
 LAUNCHER_TRACKER_PAIRS = {
-    AirDefence.Kub_2P25_ln: AirDefence.Kub_1S91_str,
-    AirDefence.X_5p73_s_125_ln: AirDefence.Snr_s_125_tr,
-    AirDefence.S_300PS_5P85C_ln: AirDefence.S_300PS_40B6M_tr,
-    AirDefence.S_300PS_5P85D_ln: AirDefence.S_300PS_40B6M_tr,
-    AirDefence.Hawk_ln: AirDefence.Hawk_tr,
-    AirDefence.Patriot_ln: AirDefence.Patriot_str,
-    AirDefence.S_75M_Volhov: AirDefence.SNR_75V,
-    AirDefence.Rapier_fsa_launcher: AirDefence.Rapier_fsa_blindfire_radar,
-    AirDefence.HQ_7_LN_SP: AirDefence.HQ_7_STR_SP,
-    AirDefence.S_200_Launcher: AirDefence.RPC_5N62V,
-    AirDefence.NASAMS_LN_B: AirDefence.NASAMS_Radar_MPQ64F1,
-    AirDefence.NASAMS_LN_C: AirDefence.NASAMS_Radar_MPQ64F1,
-    hds.SAM_SA_2__V759__LN_SM_90: AirDefence.SNR_75V,
-    hds.SAM_HQ_2_LN_SM_90: AirDefence.SNR_75V,
-    hds.SAM_SA_3__V_601P__LN_5P73: AirDefence.Snr_s_125_tr,
-    hds.SAM_SA_10B_S_300PS_5P85SE_LN: hds.SAM_SA_10B_S_300PS_30N6_TR,
-    hds.SAM_SA_10B_S_300PS_5P85SU_LN: hds.SAM_SA_10B_S_300PS_30N6_TR,
-    hds.SAM_SA_12_S_300V_9A82_LN: hds.SAM_SA_12_S_300V_9S32_TR,
-    hds.SAM_SA_12_S_300V_9A83_LN: hds.SAM_SA_12_S_300V_9S32_TR,
-    hds.SAM_SA_20_S_300PMU1_LN_5P85CE: hds.SAM_SA_20_S_300PMU1_TR_30N6E,
-    hds.SAM_SA_20_S_300PMU1_LN_5P85DE: hds.SAM_SA_20_S_300PMU1_TR_30N6E,
-    hds.SAM_SA_20B_S_300PMU2_LN_5P85SE2: hds.SAM_SA_20B_S_300PMU2_TR_92H6E_truck,
-    hds.SAM_SA_23_S_300VM_9A82ME_LN: hds.SAM_SA_23_S_300VM_9S32ME_TR,
-    hds.SAM_SA_23_S_300VM_9A83ME_LN: hds.SAM_SA_23_S_300VM_9S32ME_TR,
+    AirDefence.Kub_2P25_ln: (AirDefence.Kub_1S91_str,),
+    AirDefence.X_5p73_s_125_ln: (AirDefence.Snr_s_125_tr,),
+    AirDefence.S_300PS_5P85C_ln: (
+        AirDefence.S_300PS_40B6M_tr,
+        AirDefence.S_300PS_5H63C_30H6_tr,
+    ),
+    AirDefence.S_300PS_5P85D_ln: (
+        AirDefence.S_300PS_40B6M_tr,
+        AirDefence.S_300PS_5H63C_30H6_tr,
+    ),
+    AirDefence.Hawk_ln: (AirDefence.Hawk_tr,),
+    AirDefence.Patriot_ln: (AirDefence.Patriot_str,),
+    AirDefence.S_75M_Volhov: (AirDefence.SNR_75V,),
+    AirDefence.Rapier_fsa_launcher: (AirDefence.Rapier_fsa_blindfire_radar,),
+    AirDefence.HQ_7_LN_SP: (AirDefence.HQ_7_STR_SP,),
+    AirDefence.S_200_Launcher: (AirDefence.RPC_5N62V,),
+    AirDefence.NASAMS_LN_B: (AirDefence.NASAMS_Radar_MPQ64F1,),
+    AirDefence.NASAMS_LN_C: (AirDefence.NASAMS_Radar_MPQ64F1,),
+    hds.SAM_SA_2__V759__LN_SM_90: (AirDefence.SNR_75V,),
+    hds.SAM_HQ_2_LN_SM_90: (AirDefence.SNR_75V,),
+    hds.SAM_SA_3__V_601P__LN_5P73: (AirDefence.Snr_s_125_tr,),
+    hds.SAM_SA_10B_S_300PS_5P85SE_LN: (hds.SAM_SA_10B_S_300PS_30N6_TR,),
+    hds.SAM_SA_10B_S_300PS_5P85SU_LN: (hds.SAM_SA_10B_S_300PS_30N6_TR,),
+    hds.SAM_SA_12_S_300V_9A82_LN: (hds.SAM_SA_12_S_300V_9S32_TR,),
+    hds.SAM_SA_12_S_300V_9A83_LN: (hds.SAM_SA_12_S_300V_9S32_TR,),
+    hds.SAM_SA_20_S_300PMU1_LN_5P85CE: (hds.SAM_SA_20_S_300PMU1_TR_30N6E,),
+    hds.SAM_SA_20_S_300PMU1_LN_5P85DE: (hds.SAM_SA_20_S_300PMU1_TR_30N6E,),
+    hds.SAM_SA_20B_S_300PMU2_LN_5P85SE2: (hds.SAM_SA_20B_S_300PMU2_TR_92H6E_truck,),
+    hds.SAM_SA_23_S_300VM_9A82ME_LN: (hds.SAM_SA_23_S_300VM_9S32ME_TR,),
+    hds.SAM_SA_23_S_300VM_9A83ME_LN: (hds.SAM_SA_23_S_300VM_9S32ME_TR,),
 }
 
 UNITS_WITH_RADAR = {
diff --git a/game/theater/theatergroup.py b/game/theater/theatergroup.py
index 535fc99c..2965f146 100644
--- a/game/theater/theatergroup.py
+++ b/game/theater/theatergroup.py
@@ -217,8 +217,9 @@ class TheaterGroup:
             else:
                 max_non_radar = max(max_non_radar, unit.threat_range)
         for launcher, threat_range in launchers.items():
-            if LAUNCHER_TRACKER_PAIRS[launcher] in live_trs:
-                max_tel_range = max(max_tel_range, threat_range)
+            for tr in LAUNCHER_TRACKER_PAIRS[launcher]:
+                if tr in live_trs:
+                    max_tel_range = max(max_tel_range, threat_range)
         if radar_only:
             return max(max_tel_range, max_telar_range)
         return max(max_tel_range, max_telar_range, max_non_radar)