bug fix 1/2