A 1099-R was issued for a distribution taken after my client died in 2017. The distribution code from the IRA was "4-Death"

The gross distribution, taxable distribution, and federal tax withheld should be entered on the Estate's form 1041.

I entered the 1099-R info on the 2017 final 1040.

Then on the next line, I backed out the 1099-R with negative numbers, and entered a note that said that I moved the income to the EIN on the 2017 form 1041.

Is there a better way to handle this?