fixed beta 7 errors