bug fix (2)