diff --git a/FollowMe/simplegcs.cpp b/FollowMe/simplegcs.cpp
index 2c2c25fe0f3d8e8eafdec5a78135f7f4d8d72fff..8b3dafab5d5331068b5c9d92963c866cf2c9f50c 100644
--- a/FollowMe/simplegcs.cpp
+++ b/FollowMe/simplegcs.cpp
@@ -65,8 +65,8 @@ void simplegcs_send_heartbeat(mavlink_channel_t chan) {
 
 bool simplegcs_try_send_statustext(mavlink_channel_t chan, const char *text, int len) {
 
-    int payload_space = comm_get_txspace(chan) - MAVLINK_NUM_NON_PAYLOAD_BYTES;
-    if (payload_space < MAVLINK_MSG_ID_STATUSTEXT_LEN) return false;
+    uint16_t txspace = comm_get_txspace(chan);
+    if (payload_space < MAVLINK_MSG_ID_STATUSTEXT_LEN+MAVLINK_NUM_NON_PAYLOAD_BYTES) return false;
 
     char statustext[50] = { 0 };
     if (len < 50) {