bug fix again