diff --git a/ArduCopter/RC_Channel.cpp b/ArduCopter/RC_Channel.cpp
index 559f9bf38f..8ffaa17904 100644
--- a/ArduCopter/RC_Channel.cpp
+++ b/ArduCopter/RC_Channel.cpp
@@ -113,10 +113,8 @@ void RC_Channel_Copter::init_aux_function(const aux_func_t ch_option, const AuxS
     case AUX_FUNC::SUPERSIMPLE_MODE:
     case AUX_FUNC::SURFACE_TRACKING:
     case AUX_FUNC::WINCH_ENABLE:
-        do_aux_function(ch_option, ch_flag);
-        break;
     case AUX_FUNC::AIRMODE:
-        do_aux_function_change_air_mode(ch_flag);
+        run_aux_function(ch_option, ch_flag, AuxFuncTriggerSource::INIT);
         break;
     default:
         RC_Channel::init_aux_function(ch_option, ch_flag);
@@ -127,7 +125,7 @@ void RC_Channel_Copter::init_aux_function(const aux_func_t ch_option, const AuxS
 // do_aux_function_change_mode - change mode based on an aux switch
 // being moved
 void RC_Channel_Copter::do_aux_function_change_mode(const Mode::Number mode,
-                                                     const AuxSwitchPos ch_flag)
+                                                    const AuxSwitchPos ch_flag)
 {
     switch(ch_flag) {
     case AuxSwitchPos::HIGH: {