issue #10: bug fix and click event