bug fix
some fix