merge some bug fix