Make sure we convert P0 and P1 to F0 and F1 even if no errors, for real this time