diff --git a/A3A/addons/core/functions/Base/fn_flagaction.sqf b/A3A/addons/core/functions/Base/fn_flagaction.sqf
index c58bc65acd..051595999c 100644
--- a/A3A/addons/core/functions/Base/fn_flagaction.sqf
+++ b/A3A/addons/core/functions/Base/fn_flagaction.sqf
@@ -80,7 +80,9 @@ switch _typeX do
 
             _actionX = _flag addAction [format ["<t>Carry %1</t> <img image='\A3\ui_f\data\igui\cfg\actions\take_ca.paa' size='1.6' shadow=2 />",name _flag], A3A_fnc_carry,nil,5,true,false,"","(isPlayer _this) and (_this == _this getVariable ['owner',objNull]) and (isNull attachedTo _target) and !(_this getVariable [""helping"",false]);",4];// TODO: partial string created - unsure about implementation
             _flag setUserActionText [_actionX,format [localize "STR_A3A_fn_base_flagaction_heal_carry",name _flag],"<t size='2'><img image='\A3\ui_f\data\igui\cfg\actions\take_ca.paa'/></t>"];// TODO: string created, unsure about implementation
-            [_flag] call A3A_Logistics_fnc_addLoadAction;
+
+            // Call the internal logistics function, because this one is already global-JIP
+            [_flag, "load"] call A3A_Logistics_fnc_addAction;
         };
     };
     case "remove":
diff --git a/A3A/addons/logistics/Public/fn_addLoadAction.sqf b/A3A/addons/logistics/Public/fn_addLoadAction.sqf
index 1d9110bdfc..6853a9f59a 100644
--- a/A3A/addons/logistics/Public/fn_addLoadAction.sqf
+++ b/A3A/addons/logistics/Public/fn_addLoadAction.sqf
@@ -33,5 +33,6 @@ if (!alive _object) exitWith {
 
 if (([_object] call A3A_Logistics_fnc_getCargoNodeType) isEqualTo -1) exitWith {nil};
 
-[_object , _action] remoteExec ["A3A_Logistics_fnc_addAction", 0, _object];
+private _jipKey = "A3A_Logistics_" + _action + ((str _object splitString ":") joinString "");
+[_object, _action, _jipKey] remoteExec ["A3A_Logistics_fnc_addAction", 0, _jipKey];
 nil