回複:I have the same situation. But
the best shot is to extend your passport first and correct your I-94 at your local port of entry(airport in other name) right after that. The correction will take about 10min and cost you nothing. Do not rely on a longshot.