some bug fix!