diff --git a/modules/pegasus-actor.js b/modules/pegasus-actor.js
index c58a4de..96c89c2 100644
--- a/modules/pegasus-actor.js
+++ b/modules/pegasus-actor.js
@@ -1668,6 +1668,7 @@ export class PegasusActor extends Actor {
             rollData.statVehicle = vehicle.system.statistics.man
             rollData.vehicleKey = "man"
           }
+          vehicle.addVehicleShields( rollData)
         }
         vehicle.addEffects(rollData, false, false, false)
         //this.addVehiculeHindrances(rollData.effectsList, vehicle)
@@ -2193,9 +2194,11 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   addVehicleShields(rollData) {
-    let shields = this.items.filter(shield => shield.type == "vehiclemodule" && shield.system.activated && shield.system.shielddicevalue > 0) || []
-    for (let shield of shields) {
-      rollData.vehicleShieldList.push({ label: `${shield.name} (${shield.system.arccoverage})`, type: "vehicleshield", applied: false, value: shield.system.shielddicevalue })
+    for (let arcKey in this.system.arcs) {
+      let arc = this.system.arcs[arcKey]
+      if (arc.shieldlevel > 0) {
+        rollData.vehicleShieldList.push({ label: `${arc.label} Shield`, type: "vehicleshield", applied: false, value: arc.shieldlevel })
+      }
     }
   }
 
@@ -2218,7 +2221,6 @@ export class PegasusActor extends Actor {
       rollData.mode = "stat"
       rollData.title = `Stat ${stat.label}`;
 
-      this.addVehicleShields(rollData)
       this.addVehicleArmors(rollData)
       this.startRoll(rollData)
       this.modifyVehicleStun(1)