#4: bug fix