diff --git a/src/eeprom_conversions.cpp b/src/eeprom_conversions.cpp
index 6107d3e51..3442e3c5d 100644
--- a/src/eeprom_conversions.cpp
+++ b/src/eeprom_conversions.cpp
@@ -399,7 +399,7 @@ void ConvertModel_215_to_216(ModelData &model)
   for (uint8_t i=0; i<32; i++) {
     g_model.funcSw[i] = oldModel.funcSw[i];
     CustomFnData *sd = &g_model.funcSw[i];
-    if (CFN_FUNC(sd) == FUNC_PLAY_VALUE || CFN_FUNC(sd) == FUNC_VOLUME || (CFN_FUNC(sd) >= FUNC_ADJUST_GV1 && CFN_FUNC(sd) <= FUNC_ADJUST_GVLAST && CFN_GVAR_MODE(sd) == FUNC_ADJUST_GVAR_SOURCE)) {
+    if (CFN_FUNC(sd) == FUNC_PLAY_VALUE || CFN_FUNC(sd) == FUNC_VOLUME || (IS_ADJUST_GV_FUNCTION(sd) && CFN_GVAR_MODE(sd) == FUNC_ADJUST_GVAR_SOURCE)) {
 #if defined(PCBTARANIS)
       CFN_PARAM(sd) += 1 + MAX_INPUTS + MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS;
 #endif
diff --git a/src/myeeprom.h b/src/myeeprom.h
index 3ddb63d69..8c1e5ee97 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -708,6 +708,12 @@ enum Functions {
   FUNC_MAX
 };
 
+#if defined(GVARS)
+  #define IS_ADJUST_GV_FUNCTION(sd)  (CFN_FUNC(sd) >= FUNC_ADJUST_GV1 && CFN_FUNC(sd) <= FUNC_ADJUST_GVLAST)
+#else
+  #define IS_ADJUST_GV_FUNCTION(sd)  (0)
+#endif
+
 #if defined(VOICE)
   #define HAS_REPEAT_PARAM(sd) (CFN_FUNC(sd) == FUNC_PLAY_SOUND || (CFN_FUNC(sd) >= FUNC_PLAY_TRACK && CFN_FUNC(sd) <= FUNC_PLAY_VALUE))
 #else