Fixes on payment amount

Raffaele Luccisano requested to merge fix-deferred-payment into master Mar 30, 2021