Some bug resolved