fixed Beta 6 errors