some bug fix
some bug fix