critical bug fix 2