Merge pull request #409 from brownnrl/amount-fix