diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs
index 7a5f1675..5e113dbb 100644
--- a/ReallifeGamemode.Server/Managers/InventoryManager.cs
+++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs
@@ -320,7 +320,7 @@ namespace ReallifeGamemode.Server.Managers
 
       using (var context = new DatabaseContext())
       {
-        UserItem item = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == itemID && u.Amount <= itemAmount).FirstOrDefault();
+        UserItem item = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == itemID && u.Amount >= itemAmount).FirstOrDefault();
 
         if (item == null)
         {
@@ -328,27 +328,30 @@ namespace ReallifeGamemode.Server.Managers
           return;
         }
 
-        RemoveUserItem(user, item, itemAmount);
 
-        if (!vehicleItems.ContainsKey(player))
-        {
-          player.TriggerEvent("Error", "Transfer nicht möglich.");
-          return;
-        }
-
-        if (!vehicleItems.ContainsKey(player))
-          vehicleItems.Add(player, new List<InventoryItem>());
-        Vehicle veh = null;
-        if (vehicleItems[player].Count != 0)
-          veh = vehicleItems[player].FirstOrDefault().vehicle;
+        /*
+                if (!vehicleItems.ContainsKey(player))
+                {
+                  player.TriggerEvent("Error", "Transfer nicht möglich.");
+                  return;
+                }
 
+                if (!vehicleItems.ContainsKey(player))
+                  vehicleItems.Add(player, new List<InventoryItem>());
+                Vehicle veh = null;
+                if (vehicleItems[player].Count != 0)
+                  veh = vehicleItems[player].FirstOrDefault().vehicle;
+        */
+        Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 2).FirstOrDefault();
         if (veh == null)
         {
           player.TriggerEvent("Error", "Transfer nicht möglich.");
           return;
         }
+      
 
         AddItemToVehicleInventory(veh, itemID, itemAmount);
+
         SetVehicleItems(player);
         VehicleItem vehicleItem = context.VehicleItems.Where(f => f.ItemId == itemID && f.Vehicle == VehicleManager.GetServerVehicleFromVehicle(veh, context)).FirstOrDefault();
         context.SaveChanges();