Foreign Retirement Pension-Problems with FIN Error-Form 1099-R and Payer's Federal Identification Number-Please Fix It.

Hi, for years I've been using form 1099-R to report my wife's foreign pension income without any problems. I was using nine digits 11-1111111 as payers FIN and I had no problems so far. Actually, this method was recommended by many Turbo Tax users. This year TT wouldn't allow me to do that, I'm getting an error which would prevent e-filing for sure. I'd like to use 1099-R because the program automatically would transfer this properly as a  retirement income to our New York state income tax return. NYS allows $20,000 pension and annuity income exclusion. How can I fix this error without creating any other income new entries or new forms? Is there a secret 9-digit code or can Intuit properly address and  fix this issue. I also think it's time for Intuit to make a generic 1099-R form for all those foreign pension payers without FIN. There are many people getting foreign retirement income.  Thank you,