OPT period has been extended. So, it seems your OPT will also extend to another 17 months. I think, no worries now.