diff --git a/Changelogs/0.3.7.0.txt b/Changelogs/0.3.7.0.txt
index e922b88d..83ff6d1d 100644
--- a/Changelogs/0.3.7.0.txt
+++ b/Changelogs/0.3.7.0.txt
@@ -22,7 +22,7 @@
 [Changed] Crafting wood and metal spike traps now require 2x Sticks.
 [Changed] Change all publicVariableServer calls to use remoteExec calls for better performance.
 [Fixed] Male(Female) characters lose vest items after equipping opposite sex's vest.
-[Fixed] Secure storage locking mechanism improvments should prevent any unwanted intrusions.
+[Fixed] Secure storage locking mechanism improvements should prevent any unwanted intrusions.
 [Fixed] Reworked login to prevent getting stuck at "waiting for inventory".
 [Fixed] Prevented death just after revive due still having high blood pressure.
 [Fixed] Incorrectly being able to sell/buy items from a dead trader.
@@ -59,6 +59,7 @@
 [Changed] Commented out Halloween masks from loot tables.
 [Changed] Player positions in database now use Epoch precision position functions.
 [Updated] New Battleye remoteExec.txt for added remoteExec calls.
+[Fixed] Admin tools map AI markers not working. 
 [Fixed] Static propPos campfires not working on Takistan due to disabled simulation.
 [Fixed] When killed instead of saving blank array delete (object,trader,vehicle) data from database.
 [Info] Removed old .bikey and added new one for 0370.
diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo
index cd3b5d35..67d1ea34 100644
Binary files a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo differ
diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf
index 06c40400..961db0f1 100644
--- a/Sources/epoch_server/init/server_securityfunctions.sqf
+++ b/Sources/epoch_server/init/server_securityfunctions.sqf
@@ -1373,13 +1373,12 @@ _skn_admincode = compileFinal ("
 			if ("+_skn_tg_map_ai+") then {
 				_size = (0.5/ctrlMapScale _display) max 20;
 				{
-					if (isPlayer _x) then {
-						_display drawIcon [
-							getText (configFile >> 'CfgVehicles' >> typeOf _x >> 'Icon'), _x call _getDmgColor, visiblePosition _x, _size, _size, getDir _x,
-							getText (configFile >> 'CfgVehicles' >> typeOf _x >> 'displayName')
-						];
-					};
-				}forEach allUnits-playableUnits;
+					_agent = agent _x;
+					_display drawIcon [
+						getText (configFile >> 'CfgVehicles' >> typeOf _agent >> 'Icon'), _agent call _getDmgColor, visiblePosition _agent, _size, _size, getDir _agent,
+						getText (configFile >> 'CfgVehicles' >> typeOf _agent >> 'displayName')
+					];
+				}forEach agents;
 			};
 			if ("+_skn_tg_map_basebuilding+") then {