Merge pull request #1268 from TheBlueMatt/2022-01-balance-underflow