diff --git a/AntennaTracker/RC_Channel_Tracker.h b/AntennaTracker/RC_Channel_Tracker.h
index 74f15ce34af..5b5b5cf2319 100644
--- a/AntennaTracker/RC_Channel_Tracker.h
+++ b/AntennaTracker/RC_Channel_Tracker.h
@@ -19,7 +19,13 @@ public:
 
     RC_Channel_Tracker obj_channels[NUM_RC_CHANNELS];
     RC_Channel_Tracker *channel(const uint8_t chan) override {
-        if (chan >= NUM_RC_CHANNELS) {
+        if (chan >= ARRAY_SIZE(obj_channels)) {
+            return nullptr;
+        }
+        return &obj_channels[chan];
+    }
+    const RC_Channel_Tracker *channel(const uint8_t chan) const override {
+        if (chan >= ARRAY_SIZE(obj_channels)) {
             return nullptr;
         }
         return &obj_channels[chan];
diff --git a/AntennaTracker/mode_manual.cpp b/AntennaTracker/mode_manual.cpp
index ecd7a5562ec..fcc28870744 100644
--- a/AntennaTracker/mode_manual.cpp
+++ b/AntennaTracker/mode_manual.cpp
@@ -11,9 +11,9 @@
 void ModeManual::update()
 {
     // copy yaw and pitch input to output
-    SRV_Channels::set_output_pwm(SRV_Channel::k_tracker_yaw, RC_Channels::rc_channel(CH_YAW)->get_radio_in());
+    SRV_Channels::set_output_pwm(SRV_Channel::k_tracker_yaw, rc().channel(CH_YAW)->get_radio_in());
     SRV_Channels::constrain_pwm(SRV_Channel::k_tracker_yaw);
 
-    SRV_Channels::set_output_pwm(SRV_Channel::k_tracker_pitch, RC_Channels::rc_channel(CH_PITCH)->get_radio_in());
+    SRV_Channels::set_output_pwm(SRV_Channel::k_tracker_pitch, rc().channel(CH_PITCH)->get_radio_in());
     SRV_Channels::constrain_pwm(SRV_Channel::k_tracker_pitch);
 }