After you enter the 1099R say it was not an RMD and then that you rolled it over (even if back into the same account). Was any withholding taken out? If it was then did you replace the withholding with your own money? Otherwise the withholding will be a taxable distribution itself.
