Make sure J2 is included in th J1 waiver application. Otherwise, J2 will still be subject to 2-year obligation after J1 wiver approval.