fix the click bugs