wip - Payment period with save issue