diff --git a/imports/getClosestPlayer/client.lua b/imports/getClosestPlayer/client.lua
index b1f1da1c2..063b1490d 100644
--- a/imports/getClosestPlayer/client.lua
+++ b/imports/getClosestPlayer/client.lua
@@ -14,7 +14,7 @@
 ---@return vector3? playerCoords
 function lib.getClosestPlayer(coords, maxDistance, includePlayer)
 	local players = GetActivePlayers()
-	local closestId, closestPed, closestCoords
+	local closestId, closestPed, closestCoords, closestVehicle
 	maxDistance = maxDistance or 2.0
 
 	for i = 1, #players do
@@ -23,6 +23,10 @@ function lib.getClosestPlayer(coords, maxDistance, includePlayer)
 		if playerId ~= cache.playerId or includePlayer then
 			local playerPed = GetPlayerPed(playerId)
 			local playerCoords = GetEntityCoords(playerPed)
+
+            local vehicle = GetVehiclePedIsIn(playerPed, false)
+            local playerCoords = vehicle == 0 and GetEntityCoords(playerPed) or GetWorldPositionOfEntityBone(playerPed, 0)
+            
 			local distance = #(coords - playerCoords)
 
 			if distance < maxDistance then
@@ -30,11 +34,12 @@ function lib.getClosestPlayer(coords, maxDistance, includePlayer)
 				closestId = playerId
 				closestPed = playerPed
 				closestCoords = playerCoords
+                closestVehicle = vehicle
 			end
 		end
 	end
 
-	return closestId, closestPed, closestCoords
+	return closestId, closestPed, closestCoords, closestVehicle
 end
 
 return lib.getClosestPlayer
diff --git a/imports/getNearbyPlayers/client.lua b/imports/getNearbyPlayers/client.lua
index 30bb811c2..a676b0d0c 100644
--- a/imports/getNearbyPlayers/client.lua
+++ b/imports/getNearbyPlayers/client.lua
@@ -21,7 +21,10 @@ function lib.getNearbyPlayers(coords, maxDistance, includePlayer)
 
         if playerId ~= cache.playerId or includePlayer then
             local playerPed = GetPlayerPed(playerId)
-            local playerCoords = GetEntityCoords(playerPed)
+            
+            local vehicle = GetVehiclePedIsIn(playerPed, false)
+            local playerCoords = vehicle == 0 and GetEntityCoords(playerPed) or GetWorldPositionOfEntityBone(playerPed, 0)
+            
             local distance = #(coords - playerCoords)
 
             if distance < maxDistance then
@@ -30,6 +33,7 @@ function lib.getNearbyPlayers(coords, maxDistance, includePlayer)
                     id = playerId,
                     ped = playerPed,
                     coords = playerCoords,
+                    vehicle = vehicle
                 }
             end
         end