Error in International App -students currently residing in the US with a current F1 visa status

On the Visa/Dependents page of the app, one of the questions asks if the student currently resides in the US.  When they check "yes," they are asked for an I-94 number and the expiration date.  For students on an F-1 visa, they should check D/S for duration of status (because there is no expiration date).  However, when this is done, the application provides an error, saying that the student must enter an expiration date to proceed.  I have been having students simply check "no" to the initial question of residing in the US, as they are otherwise unable to submit the application.  Of course, checking "no" is inaccurate, as they ARE here in the US and have I-94 admission numbers.