bug fix 2nd