"Ever Green" Lease Payment Amendment Amortization Issue

Summary: We're trying to add on on extended payment periods to a lease. But, we have to do the amendment commencement within the end of the lease. But, the amortization is getting thrown off by that date. For example, we have a lease ending 3/31/2025. But, we want to extend the lease another year to 3/31/2026 and have a new monthly payment 4/1/2025 to 3/31/2026. But, the system seems to be amortizing for just that one day of 3/31/2025, then each month it amortize in all the following month, but understating in those months to offset that first day. Is there a way to avoid this?