Update to work correctly with Beta 4.