some bug fix1