Fix problem with double firing click event