diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index ba58a329d..15713ab96 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -321,6 +321,15 @@ enum R9MSubTypes
   MODULE_SUBTYPE_R9M_LAST=MODULE_SUBTYPE_R9M_AUPLUS
 };
 
+enum R9MRegion
+{
+  MODULE_REGION_R9M_FCC,
+  MODULE_REGION_R9M_EU,
+  MODULE_REGION_R9M_FLEX,
+  MODULE_REGION_R9M_LAST=MODULE_REGION_R9M_FLEX
+};
+
+
 enum MultiModuleRFProtocols {
   MM_RF_PROTO_CUSTOM = -1,
   MM_RF_PROTO_FIRST = MM_RF_PROTO_CUSTOM,
diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h
index 2ecb78168..cbc26a5df 100644
--- a/radio/src/pulses/modules.h
+++ b/radio/src/pulses/modules.h
@@ -106,27 +106,27 @@ inline bool isModuleR9M(uint8_t idx)
 
 inline bool isModuleR9M_FCC(uint8_t idx)
 {
-  return isModuleR9M(idx) && g_model.moduleData[idx].subType == MODULE_SUBTYPE_R9M_FCC;
+  return isModuleR9M(idx) && g_model.moduleData[idx].r9m.region == MODULE_REGION_R9M_FCC;
 }
 
 inline bool isModuleR9M_LBT(uint8_t idx)
 {
-  return isModuleR9M(idx) && g_model.moduleData[idx].subType == MODULE_SUBTYPE_R9M_EU;
+  return isModuleR9M(idx) && g_model.moduleData[idx].r9m.region == MODULE_REGION_R9M_EU;
 }
 
 inline bool isModuleR9M_FCC_VARIANT(uint8_t idx)
 {
-  return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_EU;
+  return isModuleR9M(idx) && g_model.moduleData[idx].r9m.region != MODULE_REGION_R9M_EU;
 }
 
 inline bool isModuleR9M_EUPLUS(uint8_t idx)
 {
-  return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_EUPLUS;
+  return isModuleR9M(idx) && g_model.moduleData[idx].r9m.region == MODULE_REGION_R9M_FLEX && g_model.moduleData[idx].r9m.freq == 0x00;
 }
 
 inline bool isModuleR9M_AU_PLUS(uint8_t idx)
 {
-  return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_AUPLUS;
+  return isModuleR9M(idx) && g_model.moduleData[idx].r9m.region == MODULE_REGION_R9M_FLEX && g_model.moduleData[idx].r9m.freq == 0x01;
 }