diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 17f110ba7..401e7dd1f 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -637,7 +637,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 
 		if weapon then
 			weapon.ammo = weapon.ammo - ammoCount
-			self.triggerEvent('esx:setWeaponAmmo', weaponName, weapon.ammo)
+            _SetPedAmmo(GetPlayerPed(self.source), joaat(weaponName), weapon.ammo)
 		end
 	end
 
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 1f87bf3b4..20aa7dc6b 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -14,6 +14,16 @@ Core.playersByIdentifier = {}
 
 Core.vehicleTypesByModel = {}
 
+setmetatable(ESX.Players, {
+    __len = function()
+        local c = 0
+        for _, _ in pairs(ESX.Players) do
+            c = c + 1
+        end
+        return c
+    end
+})
+
 AddEventHandler("esx:getSharedObject", function()
 	local Invoke = GetInvokingResource()
 	print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 49ee3a8e9..02ee4b5fb 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -278,7 +278,7 @@ end
 
 function ESX.GetNumPlayers(key, val)
     if not key then
-        return #GetPlayers()
+        return #ESX.Players
     end
 
     if type(val) == "table" then