bug fix 3