Correctly resolve liberty shortages ... kind of