Some bug fixed
