diff --git a/sw/airborne/gps_ubx.c b/sw/airborne/gps_ubx.c
index 8853c08a35..eb2599ad71 100644
--- a/sw/airborne/gps_ubx.c
+++ b/sw/airborne/gps_ubx.c
@@ -89,7 +89,8 @@ uint8_t gps_utm_zone;
 uint8_t gps_mode;
 volatile bool_t gps_msg_received;
 bool_t gps_pos_available;
-uint8_t ubx_id, ubx_class,ubx_len;
+uint8_t ubx_id, ubx_class;
+uint16_t ubx_len;
 int32_t gps_lat, gps_lon;
 uint16_t gps_reset;
 
diff --git a/sw/airborne/gps_ubx.h b/sw/airborne/gps_ubx.h
index 67e1b2c544..5f8ce21afe 100644
--- a/sw/airborne/gps_ubx.h
+++ b/sw/airborne/gps_ubx.h
@@ -35,7 +35,8 @@
 
 extern uint16_t gps_reset;
 
-extern uint8_t ubx_id, ubx_class,ubx_len;
+extern uint8_t ubx_id, ubx_class;
+extern uint16_t ubx_len;
 #define UBX_MAX_PAYLOAD 255
 extern uint8_t ubx_msg_buf[UBX_MAX_PAYLOAD];