diff --git a/src/main/scala/net/psforever/objects/serverobject/terminals/tabs/ExclusionRule.scala b/src/main/scala/net/psforever/objects/serverobject/terminals/tabs/ExclusionRule.scala
index a7032db0..6ff87ed0 100644
--- a/src/main/scala/net/psforever/objects/serverobject/terminals/tabs/ExclusionRule.scala
+++ b/src/main/scala/net/psforever/objects/serverobject/terminals/tabs/ExclusionRule.scala
@@ -112,7 +112,8 @@ case object CavernVehicleQuestion extends ExclusionRule {
     obj match {
       case vehicle: Vehicle =>
         import net.psforever.objects.serverobject.structures.Building
-        if(GlobalDefinitions.isCavernVehicle(vehicle.Definition)) {
+        val definition = vehicle.Definition
+        if (definition == GlobalDefinitions.flail || definition == GlobalDefinitions.switchblade) {
           (player.Zone.GUID(msg.terminal_guid) match {
             case Some(term: Amenity) => Some(term.Owner)
             case _                   => None