Correct twice click event calls
Merge branch 'click_event'