diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp
index 79a27ab9df..05115d6e8c 100644
--- a/AntennaTracker/GCS_Mavlink.cpp
+++ b/AntennaTracker/GCS_Mavlink.cpp
@@ -370,6 +370,49 @@ MAV_RESULT GCS_MAVLINK_Tracker::_handle_command_preflight_calibration_baro()
     return ret;
 }
 
+MAV_RESULT GCS_MAVLINK_Tracker::handle_command_long_packet(const mavlink_command_long_t &packet)
+{
+    // do command
+    send_text(MAV_SEVERITY_INFO,"Command received: ");
+
+    switch(packet.command) {
+
+    case MAV_CMD_COMPONENT_ARM_DISARM:
+        if (packet.target_component == MAV_COMP_ID_SYSTEM_CONTROL) {
+            if (is_equal(packet.param1,1.0f)) {
+                tracker.arm_servos();
+                return MAV_RESULT_ACCEPTED;
+            } else if (is_zero(packet.param1))  {
+                tracker.disarm_servos();
+                return MAV_RESULT_ACCEPTED;
+            } else {
+                return MAV_RESULT_UNSUPPORTED;
+            }
+        }
+        return MAV_RESULT_UNSUPPORTED;
+
+    case MAV_CMD_DO_SET_SERVO:
+        if (!tracker.servo_test_set_servo(packet.param1, packet.param2)) {
+            return MAV_RESULT_FAILED;
+        }
+        return MAV_RESULT_ACCEPTED;
+
+        // mavproxy/mavutil sends this when auto command is entered 
+    case MAV_CMD_MISSION_START:
+        tracker.set_mode(AUTO, MODE_REASON_GCS_COMMAND);
+        return MAV_RESULT_ACCEPTED;
+
+    case MAV_CMD_ACCELCAL_VEHICLE_POS:
+        if (!tracker.ins.get_acal()->gcs_vehicle_position(packet.param1)) {
+            return MAV_RESULT_FAILED;
+        }
+        return MAV_RESULT_ACCEPTED;
+
+    default:
+        return GCS_MAVLINK::handle_command_long_packet(packet);
+    }
+}
+
 void GCS_MAVLINK_Tracker::handleMessage(mavlink_message_t* msg)
 {
     switch (msg->msgid) {
@@ -377,67 +420,6 @@ void GCS_MAVLINK_Tracker::handleMessage(mavlink_message_t* msg)
     case MAVLINK_MSG_ID_HEARTBEAT:
         break;
 
-    case MAVLINK_MSG_ID_COMMAND_LONG:
-    {
-        // decode
-        mavlink_command_long_t packet;
-        mavlink_msg_command_long_decode(msg, &packet);
-        
-        MAV_RESULT result = MAV_RESULT_UNSUPPORTED;
-        
-        // do command
-        send_text(MAV_SEVERITY_INFO,"Command received: ");
-        
-        switch(packet.command) {
-
-            case MAV_CMD_COMPONENT_ARM_DISARM:
-                if (packet.target_component == MAV_COMP_ID_SYSTEM_CONTROL) {
-                    if (is_equal(packet.param1,1.0f)) {
-                        tracker.arm_servos();
-                        result = MAV_RESULT_ACCEPTED;
-                    } else if (is_zero(packet.param1))  {
-                        tracker.disarm_servos();
-                        result = MAV_RESULT_ACCEPTED;
-                    } else {
-                        result = MAV_RESULT_UNSUPPORTED;
-                    }
-                } else {
-                    result = MAV_RESULT_UNSUPPORTED;
-                }
-            break;
-
-            case MAV_CMD_DO_SET_SERVO:
-                if (tracker.servo_test_set_servo(packet.param1, packet.param2)) {
-                    result = MAV_RESULT_ACCEPTED;
-                }
-                break;
-
-                // mavproxy/mavutil sends this when auto command is entered 
-            case MAV_CMD_MISSION_START:
-                tracker.set_mode(AUTO, MODE_REASON_GCS_COMMAND);
-                result = MAV_RESULT_ACCEPTED;
-                break;
-
-            case MAV_CMD_ACCELCAL_VEHICLE_POS:
-                result = MAV_RESULT_FAILED;
-
-                if (tracker.ins.get_acal()->gcs_vehicle_position(packet.param1)) {
-                    result = MAV_RESULT_ACCEPTED;
-                }
-                break;
-
-            default:
-                result = handle_command_long_message(packet);
-                break;
-        }
-        mavlink_msg_command_ack_send(
-            chan,
-            packet.command,
-            result);
-        
-        break;
-    }
-         
     // When mavproxy 'wp sethome' 
     case MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST:
     {
diff --git a/AntennaTracker/GCS_Mavlink.h b/AntennaTracker/GCS_Mavlink.h
index 064a858a8b..e4743a79b4 100644
--- a/AntennaTracker/GCS_Mavlink.h
+++ b/AntennaTracker/GCS_Mavlink.h
@@ -24,6 +24,7 @@ protected:
     bool set_mode(uint8_t mode) override;
 
     MAV_RESULT _handle_command_preflight_calibration_baro() override;
+    MAV_RESULT handle_command_long_packet(const mavlink_command_long_t &packet) override;
 
     int32_t global_position_int_relative_alt() const {
         return 0; // what if we have been picked up and carried somewhere?