Fix issue with first payment calculation