diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html
index 8e82cd56841..6746de00eed 100644
--- a/ADnD_2E_Revised/2ESheet.html
+++ b/ADnD_2E_Revised/2ESheet.html
@@ -2313,8 +2313,8 @@ <h4>Weapon Notes</h4>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-10"/><span></span></label></td>
                             <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent" value="1"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
-                            <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
-                            <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+(@{range-mod-attack} [Range mod])+(@{attackadj2} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
+                            <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>                                                                                                                                                          <!-- Ensures that the Mastery Point Blank +1 is only added if the Mastery proficiency level is selected -->
+                            <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+([[ {@{range-mod-attack},[[{@{prof-level2},0}>2 * {@{range-mod-attack},0}>1]]}kl1 ]] [Range mod])+(@{attackadj2} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
                             <td><input type="text" name="attr_crit-thresh2" title="@{repeating_weapons2_$X_crit-thresh2}" class="sheet-small" value="20"></td>
                             <td><input type="text" name="attr_range2" title="@{repeating_weapons2_$X_range2}" class="sheet-mintext"></td>
                             <td><input type="text" name="attr_size2" title="@{repeating_weapons2_$X_size2}" class="sheet-table-dynamic"></td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
index 49df397d694..88dd6bcd41a 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
@@ -306,8 +306,8 @@ <h4>Weapon Notes</h4>
                 <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-10"/><span></span></label></td>
                 <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent" value="1"></td>
                 <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
-                <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
-                <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+(@{range-mod-attack} [Range mod])+(@{attackadj2} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
+                <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>                                                                                                                                                          <!-- Ensures that the Mastery Point Blank +1 is only added if the Mastery proficiency level is selected -->
+                <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[ [[@{ThAC02}]]-(1d20cs>@{crit-thresh2}+([[(@{strengthhit})*@{strbonus2}]] [Strength])+([[(@{dexmissile})*@{dexbonus2}]] [Dexterity])+(@{prof-level2} [Proficiency])+([[ {@{range-mod-attack},[[{@{prof-level2},0}>2 * {@{range-mod-attack},0}>1]]}kl1 ]] [Range mod])+(@{attackadj2} [Atk Adj])+(@{temp-attackadj} [Temp buff])+(@{misc-mod}))]] using their @{weaponname2}">Hit</button></td>
                 <td><input type="text" name="attr_crit-thresh2" title="@{repeating_weapons2_$X_crit-thresh2}" class="sheet-small" value="20"></td>
                 <td><input type="text" name="attr_range2" title="@{repeating_weapons2_$X_range2}" class="sheet-mintext"></td>
                 <td><input type="text" name="attr_size2" title="@{repeating_weapons2_$X_size2}" class="sheet-table-dynamic"></td>