some bug resolved