some bug fixed
some bug fixed