Well, after my last post I decided to try again. I deleted the 1099-R forms and re-entered everything. This time everything worked perfectly using your instructions. The only thing I did differently was to enter the higher RMD/lower distribution IRA first. Other than that, I have no idea what went wrong the first time, but I'm happy with the result.
