I am using Dink (link) suggestion to work with booming blade. But regardless of working good for regular attacks when crit the formula stopped working. Original formula: Booming Blade Damage if target moves willingly: [[ [[1 + floor((@{level} + 1)/6)]]d8 ]] thunder. Bonus damage to initial melee attack: [[ [[floor((@{level} + 1)/6)]]d8 ]] thunder. I included the short swor for: 1d6+3+[[ [[floor((@{level} + 1)/6)]]d8 ]] and the result I am receiving in a critical is: If anyone can help I would be eternally grateful!