You are absolutely right. It's a very difficult problem to solve, and the current situation makes it far more challenging.

But knowing that you are not legally required to stay has to be an improvement.