Merge pull request #975 from TheBlueMatt/2021-06-fix-fee-calc