My 2025 1099-R shows distribution code P but Form 8606 adjusts cost basis in error. Excess contribution was returned prior to 4/15/2025 so no cost basis adjustment due.

TT does not allow Code P to select Corrective Distribution or Returned before due date. TT generates an incorrect Form 8606.