diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index e9b8107e..50f8366d 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -207,6 +207,8 @@ namespace ReallifeGamemode.Server.Events
               if (WeaponDealManager.checkWeaponDbyVehicle(vehicle))
               {
                 vehicle.ResetData("WeaponDealLoad");
+                vehicle.ResetData("weaponDeal");
+                vehicle.ResetData("dealPoint");
               }
 
               nearestBehindVehiclePoint.vehicle.RemoveMarkerBehind();
@@ -232,17 +234,12 @@ namespace ReallifeGamemode.Server.Events
 
               v.Amount -= itemToAdd;
               if (v.Amount <= 0)
-                dbContext.VehicleItems.Remove(v);
-
-              var newItem = new UserItem()
               {
-                ItemId = v.ItemId,
-                Slot = v.Slot,
-                Amount = itemToAdd,
-                UserId = user.Id,
-              };
+                itemToAdd += v.Amount;
+                dbContext.VehicleItems.Remove(v);
+              }
 
-              InventoryManager.AddItemToInventory(player, newItem.Id, newItem.Amount);
+              InventoryManager.AddItemToInventory(player, v.ItemId, itemToAdd);
               nearestBehindVehiclePoint.usePoint(player);
               dbContext.SaveChanges();
               return;
@@ -365,6 +362,7 @@ namespace ReallifeGamemode.Server.Events
 
                 weapon.Ammount += item.Amount;
                 ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefürgt.");
+                unloadedWeaponPackage = true;
                 context.Remove(item);
               }
             }