diff --git a/Patches/FixUnloadLastBulletPatch.cs b/Patches/FixUnloadLastBulletPatch.cs
new file mode 100644
index 0000000..2f4ebbd
--- /dev/null
+++ b/Patches/FixUnloadLastBulletPatch.cs
@@ -0,0 +1,52 @@
+using Aki.Reflection.Patching;
+using EFT.InventoryLogic;
+using HarmonyLib;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace UIFixes
+{
+    public class FixUnloadLastBulletPatch : ModulePatch
+    {
+        protected override MethodBase GetTargetMethod()
+        {
+            return AccessTools.Method(typeof(TraderControllerClass), nameof(TraderControllerClass.HasForeignEvents));
+        }
+
+        // Reimplement because theirs is wrong
+        [PatchPrefix]
+        public static bool Prefix(TraderControllerClass __instance, Item item, TraderControllerClass anotherOwner, ref bool __result, List<Item> ___list_2)
+        {
+            if (__instance == anotherOwner)
+            {
+                __result = false;
+                return false;
+            }
+
+            ___list_2.Clear();
+            item.GetAllItemsNonAlloc(___list_2, false, true);
+            foreach (Item item2 in ___list_2)
+            {
+                foreach (GEventArgs1 geventArgs in __instance.List_0)
+                {
+                    ItemAddress location = geventArgs.GetLocation();
+                    if (!geventArgs.OwnerId.Equals(anotherOwner.ID) && !geventArgs.OwnerId.Equals(__instance.ID)) // checking against this is what I changed
+                    {
+                        if (item2 == geventArgs.Item)
+                        {
+                            __result = true;
+                            return false;
+                        }
+                        if (location != null && location.Container.ParentItem == item2)
+                        {
+                            __result = true;
+                            return false;
+                        }
+                    }
+                }
+            }
+            __result = false;
+            return false;
+        }
+    }
+}
diff --git a/Plugin.cs b/Plugin.cs
index ba37baf..cad51b4 100644
--- a/Plugin.cs
+++ b/Plugin.cs
@@ -50,6 +50,7 @@ namespace UIFixes
             new OpenSortingTablePatch().Enable();
             LoadAmmoInRaidPatches.Enable();
             MultiSelectPatches.Enable();
+            new FixUnloadLastBulletPatch().Enable();
         }
 
         public static bool InRaid()