diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/gps.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/gps.lua
index d1eafec2c7..7360108113 100644
--- a/projects/core/src/main/resources/data/computercraft/lua/rom/apis/gps.lua
+++ b/projects/core/src/main/resources/data/computercraft/lua/rom/apis/gps.lua
@@ -148,8 +148,8 @@ function locate(_nTimeout, _bDebug)
             local sSide, sChannel, sReplyChannel, tMessage, nDistance = p1, p2, p3, p4, p5
             if sSide == sModemSide and sChannel == CHANNEL_GPS and sReplyChannel == CHANNEL_GPS and nDistance then
                 -- Received the correct message from the correct modem: use it to determine position
-                if type(tMessage) == "table" and #tMessage == 3 and tonumber(tMessage[1]) and tonumber(tMessage[2]) and tonumber(tMessage[3]) then
-                    local tFix = { vPosition = vector.new(tMessage[1], tMessage[2], tMessage[3]), nDistance = nDistance }
+                if type(tMessage) == "table" and (#tMessage == 3 or #tMessage == 4 and tonumber(tMessage[4])) and tonumber(tMessage[1]) and tonumber(tMessage[2]) and tonumber(tMessage[3]) then
+                    local tFix = { vPosition = vector.new(tMessage[1], tMessage[2], tMessage[3]), nDistance = tonumber(tMessage[4]) or nDistance }
                     if _bDebug then
                         print(tFix.nDistance .. " metres from " .. tostring(tFix.vPosition))
                     end
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/gps.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
index 3a65fd8ae7..ca6c06ee0f 100644
--- a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
+++ b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
@@ -79,7 +79,7 @@ elseif sCommand == "host" then
             local sSide, sChannel, sReplyChannel, sMessage, nDistance = p1, p2, p3, p4, p5
             if sSide == sModemSide and sChannel == gps.CHANNEL_GPS and sMessage == "PING" and nDistance then
                 -- We received a ping message on the GPS channel, send a response
-                modem.transmit(sReplyChannel, gps.CHANNEL_GPS, { x, y, z })
+                modem.transmit(sReplyChannel, gps.CHANNEL_GPS, { x, y, z, nDistance })
 
                 -- Print the number of requests handled
                 nServed = nServed + 1