fix bug
some bug fix