#2: bug fix