bug fix (2/2)