diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java
index 19a137259b1..9c2b018596f 100644
--- a/megamek/src/megamek/common/actions/WeaponAttackAction.java
+++ b/megamek/src/megamek/common/actions/WeaponAttackAction.java
@@ -468,7 +468,7 @@ private static ToHitData toHitCalc(Game game, int attackerId, Targetable target,
                 && (munition.contains(AmmoType.Munitions.M_ARTEMIS_V_CAPABLE)));
 
         if (ae.usesWeaponBays()) {
-            for (WeaponMounted bayW : weapon.getBayWeapons()) {
+            for (WeaponMounted bayW : weapon.streamBayWeapons()) {
                 Mounted<?> bayWAmmo = bayW.getLinked();
 
                 if (bayWAmmo == null) {