Fix @markijbema's comments from #4 and passed proper click handler