Fix click handler