Some bug fixed
some bug fixed