solve some bugs in beta