Retirement tax questions

I will try to enter the 1099R again.  I did have some nondeductible contributions in years past but I don't think TurboTax would remember those or be smart enough to calculate the non-taxable portions.  Thanks.