Beta Patch Update

Only one change so far, and it's a fix which works even without the
patch.