I have a client who is repaying the first-time homebuyer credit. For 2020, the payment was made. We are trying to file an amended return for 2020 and we get an error saying the payment amount can't be greater than the amount in the e-file database if we leave the 5405 on the return. If we remove it, or make the repayment $0, we can an error saying an installment payment is due. Is there a solution other than mailing in the return?