Actually, the fix is easy - just deny all upgrades after the 1-day EUA and then go through the waiting list. Granted, that's not a GOOD fix, but it's a cheap and easy one.

The real fix is run the EUA on the wait list when seats open up, but that probably is a significant software change.