critical bug fix again