diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 92737c1e..84f8acc2 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -497,7 +497,7 @@ namespace ReallifeGamemode.Server.Events
         List<string> stages = new List<string>();
         foreach (var e in PositionManager.ElevatorPoints)
         {
-          if (e.Position.DistanceTo2D(player.Position) <= 25 && e.Position.DistanceTo(player.Position) > 1.5)
+          if (e.Position.DistanceTo2D(player.Position) <= 30 && e.Position.DistanceTo(player.Position) > 1.5)
           {
             stages.Add(e.Stage);
           }
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index b822d2da..b8012632 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -516,6 +516,13 @@ namespace ReallifeGamemode.Server.Managers
           return;
         }
 
+        var factionVehicleCount = dbContext.FactionVehicles.ToList().Where(v => v.Id == id && v.GetOwners().Contains(user.FactionId.Value)).Count();
+        if(factionVehicleCount <= 6)
+        {
+          ChatService.ErrorMessage(player, "Die Fraktion braucht mindestens 6 Fahrzeuge");
+          return;
+        }
+
         var price = dbContext.ShopVehicles.Where(v => v.Model == factionVehicle.Model && v.Active).Select(s => new { s.Price }).FirstOrDefault();
         if (price == null)
         {