Fixed an optional issue with Beta 7.