bug fix
some changes