some bug fix again